diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 15:24:02 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 15:24:02 -0400 |
| commit | db0a2901a32c44510d7d429358d017143a649a70 (patch) | |
| tree | 4e4e41cf2e27aa4940f9c0711ca2a3bf7557a805 /drivers/media/video/usbvideo/vicam.c | |
| parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
| parent | 4cce1655b26a4df1e619b2aa3d2eea1b7a6e906c (diff) | |
Merge branch 'fixes_stg' of ../git_old into fixes
Diffstat (limited to 'drivers/media/video/usbvideo/vicam.c')
| -rw-r--r-- | drivers/media/video/usbvideo/vicam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index b7792451a299..2eb45829791c 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
| @@ -866,7 +866,7 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id) | |||
| 866 | cam->udev = dev; | 866 | cam->udev = dev; |
| 867 | cam->bulkEndpoint = bulkEndpoint; | 867 | cam->bulkEndpoint = bulkEndpoint; |
| 868 | 868 | ||
| 869 | if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1) == -1) { | 869 | if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1) < 0) { |
| 870 | kfree(cam); | 870 | kfree(cam); |
| 871 | printk(KERN_WARNING "video_register_device failed\n"); | 871 | printk(KERN_WARNING "video_register_device failed\n"); |
| 872 | return -EIO; | 872 | return -EIO; |