diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/video/usbvision/usbvision-video.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-video.c')
| -rw-r--r-- | drivers/media/video/usbvision/usbvision-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c index 1054546db908..7c17ec63c5da 100644 --- a/drivers/media/video/usbvision/usbvision-video.c +++ b/drivers/media/video/usbvision/usbvision-video.c | |||
| @@ -1487,7 +1487,7 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision) | |||
| 1487 | usbvision->vbi = usbvision_vdev_init(usbvision, | 1487 | usbvision->vbi = usbvision_vdev_init(usbvision, |
| 1488 | &usbvision_vbi_template, | 1488 | &usbvision_vbi_template, |
| 1489 | "USBVision VBI"); | 1489 | "USBVision VBI"); |
| 1490 | if (usbvision->vdev == NULL) { | 1490 | if (usbvision->vbi == NULL) { |
| 1491 | goto err_exit; | 1491 | goto err_exit; |
| 1492 | } | 1492 | } |
| 1493 | if (video_register_device(usbvision->vbi, | 1493 | if (video_register_device(usbvision->vbi, |