diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /drivers/media/video/usbvideo/vicam.c | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
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; |