[media] cafe_ccic: fix colorspace corruption on resume
If you suspend and resume during video capture, the video colours are corrupted on resume. This is because the sensor is being unconditionally powered off during the resume path. Only power down during resume if the camera is not in use, and correctly reconfigure the sensor during resume. Fixes http://dev.laptop.org/ticket/10190 Signed-off-by: Daniel Drake <dsd@laptop.org> Acked-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
c429e7b62a
commit
ea7c681e89
|
@ -859,8 +859,6 @@ static int cafe_cam_configure(struct cafe_camera *cam)
|
|||
struct v4l2_mbus_framefmt mbus_fmt;
|
||||
int ret;
|
||||
|
||||
if (cam->state != S_IDLE)
|
||||
return -EINVAL;
|
||||
v4l2_fill_mbus_format(&mbus_fmt, &cam->pix_format, cam->mbus_code);
|
||||
ret = sensor_call(cam, core, init, 0);
|
||||
if (ret == 0)
|
||||
|
@ -2196,12 +2194,13 @@ static int cafe_pci_resume(struct pci_dev *pdev)
|
|||
return ret;
|
||||
}
|
||||
cafe_ctlr_init(cam);
|
||||
cafe_ctlr_power_down(cam);
|
||||
|
||||
mutex_lock(&cam->s_mutex);
|
||||
if (cam->users > 0) {
|
||||
cafe_ctlr_power_up(cam);
|
||||
__cafe_cam_reset(cam);
|
||||
} else {
|
||||
cafe_ctlr_power_down(cam);
|
||||
}
|
||||
mutex_unlock(&cam->s_mutex);
|
||||
|
||||
|
|
Loading…
Reference in New Issue