diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-05 08:35:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-05 08:35:33 -0300 |
| commit | b6e32e956f7146fd7c85f3b7d83219c0c81f150d (patch) | |
| tree | 8826d5dfb9a46f966dd7a7a4e2ebc914c40ba8a7 /linux/drivers/media/video/usbvision/usbvision-video.c | |
| parent | 7e791201816fa3750dd804aab89a4ff0b93634a0 (diff) | |
| parent | 4ebd0d44965effc239d92927a43fcfc37e786d87 (diff) | |
| download | mediapointer-dvb-s2-b6e32e956f7146fd7c85f3b7d83219c0c81f150d.tar.gz mediapointer-dvb-s2-b6e32e956f7146fd7c85f3b7d83219c0c81f150d.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision-video.c')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-video.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c index 21abebfa1..d7056a5b7 100644 --- a/linux/drivers/media/video/usbvision/usbvision-video.c +++ b/linux/drivers/media/video/usbvision/usbvision-video.c @@ -1522,7 +1522,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision) * Returns NULL on error, a pointer to usb_usbvision else. * */ -static struct usb_usbvision *usbvision_alloc(struct usb_device *dev) +static struct usb_usbvision *usbvision_alloc(struct usb_device *dev, + struct usb_interface *intf) { struct usb_usbvision *usbvision; @@ -1531,7 +1532,7 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev) return NULL; usbvision->dev = dev; - if (v4l2_device_register(&dev->dev, &usbvision->v4l2_dev)) + if (v4l2_device_register(&intf->dev, &usbvision->v4l2_dev)) goto err_free; mutex_init(&usbvision->lock); /* available */ @@ -1669,7 +1670,8 @@ static int __devinit usbvision_probe(struct usb_interface *intf, return -ENODEV; } - if ((usbvision = usbvision_alloc(dev)) == NULL) { + usbvision = usbvision_alloc(dev, intf); + if (usbvision == NULL) { dev_err(&intf->dev, "%s: couldn't allocate USBVision struct\n", __func__); return -ENOMEM; } |