diff options
Diffstat (limited to 'drivers/media/video/cpia2/cpia2_v4l.c')
-rw-r--r-- | drivers/media/video/cpia2/cpia2_v4l.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index 515c8b57a60d..eb9f15cd4c45 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c | |||
@@ -1024,7 +1024,6 @@ static int ioctl_queryctrl(void *arg,struct camera_data *cam) | |||
1024 | if(cam->params.pnp_id.device_type == DEVICE_STV_672 && | 1024 | if(cam->params.pnp_id.device_type == DEVICE_STV_672 && |
1025 | cam->params.version.sensor_flags==CPIA2_VP_SENSOR_FLAGS_500){ | 1025 | cam->params.version.sensor_flags==CPIA2_VP_SENSOR_FLAGS_500){ |
1026 | // Maximum 15fps | 1026 | // Maximum 15fps |
1027 | int i; | ||
1028 | for(i=0; i<c->maximum; ++i) { | 1027 | for(i=0; i<c->maximum; ++i) { |
1029 | if(framerate_controls[i].value == | 1028 | if(framerate_controls[i].value == |
1030 | CPIA2_VP_FRAMERATE_15) { | 1029 | CPIA2_VP_FRAMERATE_15) { |
@@ -1959,8 +1958,7 @@ int cpia2_register_camera(struct camera_data *cam) | |||
1959 | reset_camera_struct_v4l(cam); | 1958 | reset_camera_struct_v4l(cam); |
1960 | 1959 | ||
1961 | /* register v4l device */ | 1960 | /* register v4l device */ |
1962 | if (video_register_device | 1961 | if (video_register_device(cam->vdev, VFL_TYPE_GRABBER, video_nr) < 0) { |
1963 | (cam->vdev, VFL_TYPE_GRABBER, video_nr) == -1) { | ||
1964 | ERR("video_register_device failed\n"); | 1962 | ERR("video_register_device failed\n"); |
1965 | video_device_release(cam->vdev); | 1963 | video_device_release(cam->vdev); |
1966 | return -ENODEV; | 1964 | return -ENODEV; |