diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /drivers/media/video/bw-qcam.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'drivers/media/video/bw-qcam.c')
| -rw-r--r-- | drivers/media/video/bw-qcam.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c index d3b3268bace8..6e39e253ce53 100644 --- a/drivers/media/video/bw-qcam.c +++ b/drivers/media/video/bw-qcam.c | |||
| @@ -946,8 +946,7 @@ static int init_bwqcam(struct parport *port) | |||
| 946 | 946 | ||
| 947 | printk(KERN_INFO "Connectix Quickcam on %s\n", qcam->pport->name); | 947 | printk(KERN_INFO "Connectix Quickcam on %s\n", qcam->pport->name); |
| 948 | 948 | ||
| 949 | if(video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr)==-1) | 949 | if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) { |
| 950 | { | ||
| 951 | parport_unregister_device(qcam->pdev); | 950 | parport_unregister_device(qcam->pdev); |
| 952 | kfree(qcam); | 951 | kfree(qcam); |
| 953 | return -ENODEV; | 952 | return -ENODEV; |