aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca
diff options
context:
space:
mode:
authorAndy Walls <awalls@md.metrocast.net>2010-09-12 14:45:18 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:05:55 -0200
commitc67be3ccd7616ed828586d5d3f4b48b438c0a433 (patch)
tree37b47fd8d4cfc32638b0e1706056006471dbcb8b /drivers/media/video/gspca
parentV4L/DVB: gspca_cpia1: Add basic v4l2 illuminator controls for the Intel Play QX3 (diff)
downloadlinux-dev-c67be3ccd7616ed828586d5d3f4b48b438c0a433.tar.xz
linux-dev-c67be3ccd7616ed828586d5d3f4b48b438c0a433.zip
V4L/DVB: gspca_cpia1: Restore QX3 illuminators' state on resume
Turn the lights of the QX3 on (or off) as needed when resuming and at module load. Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca')
-rw-r--r--drivers/media/video/gspca/cpia1.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index a9a4074ee682..3dbc7a16889b 100644
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -1756,6 +1756,10 @@ static int sd_init(struct gspca_dev *gspca_dev)
if (ret)
return ret;
+ /* Ensure the QX3 illuminators' states are restored upon resume */
+ if (sd->params.qx3.qx3_detected)
+ command_setlights(gspca_dev);
+
sd_stopN(gspca_dev);
PDEBUG(D_PROBE, "CPIA Version: %d.%02d (%d.%d)",