diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /drivers/media/video/c-qcam.c | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'drivers/media/video/c-qcam.c')
| -rw-r--r-- | drivers/media/video/c-qcam.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index fe9379b282d3..7f6c6b4bec10 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c | |||
| @@ -787,8 +787,7 @@ static int init_cqcam(struct parport *port) | |||
| 787 | 787 | ||
| 788 | parport_release(qcam->pdev); | 788 | parport_release(qcam->pdev); |
| 789 | 789 | ||
| 790 | if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr)==-1) | 790 | if (video_register_device(&qcam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) { |
| 791 | { | ||
| 792 | printk(KERN_ERR "Unable to register Colour QuickCam on %s\n", | 791 | printk(KERN_ERR "Unable to register Colour QuickCam on %s\n", |
| 793 | qcam->pport->name); | 792 | qcam->pport->name); |
| 794 | parport_unregister_device(qcam->pdev); | 793 | parport_unregister_device(qcam->pdev); |