AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

V4L/DVB (5518): Fix a bug on device detection

Browse Source 
Thanks to: Thierry MERLE <thierry.merle@free.fr> for pointing this

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab 2007-04-14 15:17:35 -03:00
parent c682b3a7fb
commit f8a389db50
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/video/usbvision/usbvision-cards.c
View File

@ -1027,6 +1027,7 @@ struct usbvision_device_data_st usbvision_device_data[] = {
.ModelString = "Hauppauge WinTv-USB", .ModelString = "Hauppauge WinTv-USB",
}, },
}; };
const int usbvision_device_data_size=ARRAY_SIZE(usbvision_device_data);
/* Supported Devices */ /* Supported Devices */

2
drivers/media/video/usbvision/usbvision-cards.h
View File

@ -63,3 +63,5 @@
#define PINNA_LINX_VD_IN_CAB_PAL 62 #define PINNA_LINX_VD_IN_CAB_PAL 62
#define PINNA_PCTV_BUNGEE_PAL_FM 63 #define PINNA_PCTV_BUNGEE_PAL_FM 63
#define HPG_WINTV 64 #define HPG_WINTV 64
extern const int usbvision_device_data_size;

4
drivers/media/video/usbvision/usbvision-video.c
View File

@ -1792,6 +1792,10 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
dev->descriptor.idProduct, ifnum); dev->descriptor.idProduct, ifnum);
model = devid->driver_info; model = devid->driver_info;
if ( (model<0) || (model>=usbvision_device_data_size) ) {
printk(KERN_INFO "model out of bounds %d\n",model);
return -ENODEV;
}
printk(KERN_INFO "%s: %s found\n", __FUNCTION__, printk(KERN_INFO "%s: %s found\n", __FUNCTION__,
usbvision_device_data[model].ModelString); usbvision_device_data[model].ModelString);