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/w9966.c | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'drivers/media/video/w9966.c')
| -rw-r--r-- | drivers/media/video/w9966.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index 9402f40095b4..2ff00bc5ad64 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c | |||
| @@ -334,7 +334,7 @@ static int w9966_init(struct w9966_dev* cam, struct parport* port) | |||
| 334 | memcpy(&cam->vdev, &w9966_template, sizeof(struct video_device)); | 334 | memcpy(&cam->vdev, &w9966_template, sizeof(struct video_device)); |
| 335 | cam->vdev.priv = cam; | 335 | cam->vdev.priv = cam; |
| 336 | 336 | ||
| 337 | if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) == -1) | 337 | if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) |
| 338 | return -1; | 338 | return -1; |
| 339 | 339 | ||
| 340 | w9966_setState(cam, W9966_STATE_VDEV, W9966_STATE_VDEV); | 340 | w9966_setState(cam, W9966_STATE_VDEV, W9966_STATE_VDEV); |