lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (11360): em28xx: use usb_interface.dev for v4l2_device_register

Browse Source 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab
2009-04-05 08:02:15 -03:00
parent 119753a464
commit 36fa674e6c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/em28xx/em28xx-cards.c
View File

@@ -2062,6 +2062,7 @@ void em28xx_release_resources(struct em28xx *dev)
* allocates and inits the device structs, registers i2c bus and v4l device * allocates and inits the device structs, registers i2c bus and v4l device
*/ */
static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
struct usb_interface *interface,
int minor) int minor)
{ {
struct em28xx *dev = *devhandle; struct em28xx *dev = *devhandle;
@@ -2095,7 +2096,7 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
} }
} }
retval = v4l2_device_register(&dev->udev->dev, &dev->v4l2_dev); retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
if (retval < 0) { if (retval < 0) {
em28xx_errdev("Call to v4l2_device_register() failed!\n"); em28xx_errdev("Call to v4l2_device_register() failed!\n");
return retval; return retval;
@@ -2333,7 +2334,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
/* allocate device struct */ /* allocate device struct */
mutex_init(&dev->lock); mutex_init(&dev->lock);
mutex_lock(&dev->lock); mutex_lock(&dev->lock);
retval = em28xx_init_dev(&dev, udev, nr); retval = em28xx_init_dev(&dev, udev, interface, nr);
if (retval) { if (retval) {
em28xx_devused &= ~(1<<dev->devno); em28xx_devused &= ~(1<<dev->devno);
kfree(dev); kfree(dev);