kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (11354): usbvision: use usb_interface.dev for v4l2_device_register

Browse source 
Signed-off-by: Janne Grunau <j@jannau.net>
Acked-by: Thierry Merle <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Janne Grunau 2009-04-01 08:46:00 -03:00 committed by Mauro Carvalho Chehab
parent 6e7f7b37e7
commit a878440d99
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/video/usbvision/usbvision-video.c
View file

@ -1522,7 +1522,8 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
* Returns NULL on error, a pointer to usb_usbvision else. * 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; struct usb_usbvision *usbvision;
@ -1531,7 +1532,7 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
return NULL; return NULL;
usbvision->dev = dev; usbvision->dev = dev;
if (v4l2_device_register(&dev->dev, &usbvision->v4l2_dev)) if (v4l2_device_register(&intf->dev, &usbvision->v4l2_dev))
goto err_free; goto err_free;
mutex_init(&usbvision->lock); /* available */ mutex_init(&usbvision->lock); /* available */
@ -1669,7 +1670,8 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
return -ENODEV; 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__); dev_err(&intf->dev, "%s: couldn't allocate USBVision struct\n", __func__);
return -ENOMEM; return -ENOMEM;
} }