From 2c6a07f4b177e8ecf002ab3dbc4d09f7c6160d63 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 18 Feb 2009 12:22:16 -0300 Subject: [PATCH] --- yaml --- r: 137957 b: refs/heads/master c: 674a323218ab0b0be100b51c251a72787b5c9e3a h: refs/heads/master i: 137955: 9849cc1474f9a083ac96eb4e5a8adc7deefb35a0 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7115.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index afb94d834b8c..b28dcbdc7b61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10afbef15e7bba5e1008f583852077743d28c395 +refs/heads/master: 674a323218ab0b0be100b51c251a72787b5c9e3a diff --git a/trunk/drivers/media/video/saa7115.c b/trunk/drivers/media/video/saa7115.c index a845582ca5d4..b1c5f63bb77a 100644 --- a/trunk/drivers/media/video/saa7115.c +++ b/trunk/drivers/media/video/saa7115.c @@ -1310,11 +1310,12 @@ static int saa711x_s_stream(struct v4l2_subdev *sd, int enable) v4l2_dbg(1, debug, sd, "%s output\n", enable ? "enable" : "disable"); - if (state->enable != enable) { - state->enable = enable; - saa711x_write(sd, R_87_I_PORT_I_O_ENA_OUT_CLK_AND_GATED, - state->enable); - } + if (state->enable == enable) + return 0; + state->enable = enable; + if (!saa711x_has_reg(state->ident, R_87_I_PORT_I_O_ENA_OUT_CLK_AND_GATED)) + return 0; + saa711x_write(sd, R_87_I_PORT_I_O_ENA_OUT_CLK_AND_GATED, state->enable); return 0; }