diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /drivers/media/video/cpia.c | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'drivers/media/video/cpia.c')
| -rw-r--r-- | drivers/media/video/cpia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c index dc8cc6115e2f..a661800b0e69 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/media/video/cpia.c | |||
| @@ -3955,7 +3955,7 @@ struct cam_data *cpia_register_camera(struct cpia_camera_ops *ops, void *lowleve | |||
| 3955 | camera->lowlevel_data = lowlevel; | 3955 | camera->lowlevel_data = lowlevel; |
| 3956 | 3956 | ||
| 3957 | /* register v4l device */ | 3957 | /* register v4l device */ |
| 3958 | if (video_register_device(&camera->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { | 3958 | if (video_register_device(&camera->vdev, VFL_TYPE_GRABBER, video_nr) < 0) { |
| 3959 | kfree(camera); | 3959 | kfree(camera); |
| 3960 | printk(KERN_DEBUG "video_register_device failed\n"); | 3960 | printk(KERN_DEBUG "video_register_device failed\n"); |
| 3961 | return NULL; | 3961 | return NULL; |