diff options
Diffstat (limited to 'linux/drivers/usb')
| -rw-r--r-- | linux/drivers/usb/media/em2820-i2c.c | 3 | ||||
| -rw-r--r-- | linux/drivers/usb/media/em2820-video.c | 18 |
2 files changed, 15 insertions, 6 deletions
diff --git a/linux/drivers/usb/media/em2820-i2c.c b/linux/drivers/usb/media/em2820-i2c.c index 88a771ad2..5f42bb961 100644 --- a/linux/drivers/usb/media/em2820-i2c.c +++ b/linux/drivers/usb/media/em2820-i2c.c @@ -373,6 +373,9 @@ static int em2820_i2c_eeprom(struct em2820 *dev, unsigned char *eedata, int len) printk(KERN_INFO "200mA max power\n"); break; } + printk(KERN_INFO "Table at 0x%02x, strings=0x%04x, 0x%04x, 0x%04x\n", + em_eeprom->string_idx_table,em_eeprom->string1, + em_eeprom->string2,em_eeprom->string3); return 0; } diff --git a/linux/drivers/usb/media/em2820-video.c b/linux/drivers/usb/media/em2820-video.c index 51c34edfb..19088890d 100644 --- a/linux/drivers/usb/media/em2820-video.c +++ b/linux/drivers/usb/media/em2820-video.c @@ -1810,7 +1810,7 @@ static int em2820_init_dev(struct em2820 **devhandle, struct usb_device *udev, #ifdef CONFIG_MODULES /* request some modules */ if (dev->decoder == EM2820_SAA7113 || dev->decoder == EM2820_SAA7114) - request_module("saa7113"); + request_module("saa711x"); if (dev->decoder == EM2820_TVP5150) request_module("tvp5150"); if (dev->has_tuner) @@ -1932,14 +1932,20 @@ static int em2820_usb_probe(struct usb_interface *interface, udev = usb_get_dev(interface_to_usbdev(interface)); ifnum = interface->altsetting[0].desc.bInterfaceNumber; - em2820_err(DRIVER_NAME " new device (%04x:%04x): interface %i, class %i\n", - udev->descriptor.idVendor,udev->descriptor.idProduct, - ifnum, - interface->altsetting[0].desc.bInterfaceClass); /* Don't register audio interfaces */ - if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) + if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) { + em2820_err(DRIVER_NAME " audio device (%04x:%04x): interface %i, class %i\n", + udev->descriptor.idVendor,udev->descriptor.idProduct, + ifnum, + interface->altsetting[0].desc.bInterfaceClass); return -ENODEV; + } + + em2820_err(DRIVER_NAME " new video device (%04x:%04x): interface %i, class %i\n", + udev->descriptor.idVendor,udev->descriptor.idProduct, + ifnum, + interface->altsetting[0].desc.bInterfaceClass); endpoint = &interface->cur_altsetting->endpoint[1].desc; |