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/stv680.c | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'drivers/media/video/stv680.c')
| -rw-r--r-- | drivers/media/video/stv680.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index 56dc3d6b5b29..dce947439459 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c | |||
| @@ -1462,7 +1462,7 @@ static int stv680_probe (struct usb_interface *intf, const struct usb_device_id | |||
| 1462 | mutex_init (&stv680->lock); | 1462 | mutex_init (&stv680->lock); |
| 1463 | wmb (); | 1463 | wmb (); |
| 1464 | 1464 | ||
| 1465 | if (video_register_device (stv680->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { | 1465 | if (video_register_device(stv680->vdev, VFL_TYPE_GRABBER, video_nr) < 0) { |
| 1466 | PDEBUG (0, "STV(e): video_register_device failed"); | 1466 | PDEBUG (0, "STV(e): video_register_device failed"); |
| 1467 | retval = -EIO; | 1467 | retval = -EIO; |
| 1468 | goto error_vdev; | 1468 | goto error_vdev; |