Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91cad0f2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: 856: some module rename and small fixes 



- Some module rename and small fixes

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 141a8779

drivers/media/video/em28xx/em28xx-i2c.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/media/video/em28xx/em28xx-video.c

+12 −6
Original line number Diff line number Diff line
@@ -1655,7 +1655,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)
@@ -1753,14 +1753,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",



	/* Don't register audio interfaces */

	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);



	/* Don't register audio interfaces */

	if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO)

		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;