From 307078b8633cd116ee381cb8b0e08e6db4e82f9f Mon Sep 17 00:00:00 2001 From: Andy Walls Date: Sun, 12 Sep 2010 14:45:18 -0300 Subject: [PATCH] --- yaml --- r: 219107 b: refs/heads/master c: c67be3ccd7616ed828586d5d3f4b48b438c0a433 h: refs/heads/master i: 219105: c2c2f674fe72a31fd395dc8826eeab375b630fc3 219103: 9b4139befb24ba5fe117a4740532b535009e8519 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/cpia1.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 94ed3c1e09d4..11fa7882bf74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51513353ec13a1318df31aaa4af4a6d196868904 +refs/heads/master: c67be3ccd7616ed828586d5d3f4b48b438c0a433 diff --git a/trunk/drivers/media/video/gspca/cpia1.c b/trunk/drivers/media/video/gspca/cpia1.c index a9a4074ee682..3dbc7a16889b 100644 --- a/trunk/drivers/media/video/gspca/cpia1.c +++ b/trunk/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)",