diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-05 08:02:15 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-05 08:02:15 -0300 |
| commit | 4ebd0d44965effc239d92927a43fcfc37e786d87 (patch) | |
| tree | 1cf6c4eb1bbc952b1470e7891e941ac2a479e414 /linux/drivers/media | |
| parent | ea8dbc7189efcfa7dbfc93f5deca1df176c5a3ef (diff) | |
| download | mediapointer-dvb-s2-4ebd0d44965effc239d92927a43fcfc37e786d87.tar.gz mediapointer-dvb-s2-4ebd0d44965effc239d92927a43fcfc37e786d87.tar.bz2 | |
em28xx: use usb_interface.dev for v4l2_device_register
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index 56c27b745..55b5cd724 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -2142,6 +2142,7 @@ void em28xx_release_resources(struct em28xx *dev) * allocates and inits the device structs, registers i2c bus and v4l device */ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, + struct usb_interface *interface, int minor) { struct em28xx *dev = *devhandle; @@ -2175,7 +2176,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) { em28xx_errdev("Call to v4l2_device_register() failed!\n"); return retval; @@ -2416,7 +2417,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, /* allocate device struct */ mutex_init(&dev->lock); mutex_lock(&dev->lock); - retval = em28xx_init_dev(&dev, udev, nr); + retval = em28xx_init_dev(&dev, udev, interface, nr); if (retval) { em28xx_devused &= ~(1<<dev->devno); kfree(dev); |