summaryrefslogtreecommitdiff
path: root/drivers/media/video/usbvideo/vicam.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-11 13:13:58 +0400
committerIngo Molnar <mingo@elte.hu>2008-09-11 13:13:58 +0400
commit6ef62164e794c480259ac158aa6c8c7b85746545 (patch)
treec4540211d0cef9c88d96f30f89ac4b9c1a570683 /drivers/media/video/usbvideo/vicam.c
parente75b986af7881ed8d8ccb1ed154045ed17cfebd0 (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
downloadlinux-6ef62164e794c480259ac158aa6c8c7b85746545.tar.xz
Merge commit 'v2.6.27-rc6' into timers/urgent
Diffstat (limited to 'drivers/media/video/usbvideo/vicam.c')
-rw-r--r--drivers/media/video/usbvideo/vicam.c2
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)
cam->udev = dev;
cam->bulkEndpoint = bulkEndpoint;
- if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1) == -1) {
+ if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1) < 0) {
kfree(cam);
printk(KERN_WARNING "video_register_device failed\n");
return -EIO;