diff options
| author | Axel Lin | 2014-08-16 08:57:30 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-09-22 01:11:30 +0200 |
| commit | 18cb65033832df8d33aa3a9c9c3e32016fc09cf5 (patch) | |
| tree | e819d0dac37b00e76dcb6ce00f1812ab6da7d70f /drivers/media/i2c/tvp7002.c | |
| parent | [media] radio-si470x-usb: use USB API functions rather than constants (diff) | |
| download | kernel-qcow2-linux-18cb65033832df8d33aa3a9c9c3e32016fc09cf5.tar.gz kernel-qcow2-linux-18cb65033832df8d33aa3a9c9c3e32016fc09cf5.tar.xz kernel-qcow2-linux-18cb65033832df8d33aa3a9c9c3e32016fc09cf5.zip | |
[media] tvp7002: Don't update device->streaming if write to register fails
This ensures device->streaming has correct status.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/i2c/tvp7002.c')
| -rw-r--r-- | drivers/media/i2c/tvp7002.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c index 11f2387e1dab..51bac762638b 100644 --- a/drivers/media/i2c/tvp7002.c +++ b/drivers/media/i2c/tvp7002.c @@ -775,25 +775,20 @@ static int tvp7002_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index, static int tvp7002_s_stream(struct v4l2_subdev *sd, int enable) { struct tvp7002 *device = to_tvp7002(sd); - int error = 0; + int error; if (device->streaming == enable) return 0; - if (enable) { - /* Set output state on (low impedance means stream on) */ - error = tvp7002_write(sd, TVP7002_MISC_CTL_2, 0x00); - device->streaming = enable; - } else { - /* Set output state off (high impedance means stream off) */ - error = tvp7002_write(sd, TVP7002_MISC_CTL_2, 0x03); - if (error) - v4l2_dbg(1, debug, sd, "Unable to stop streaming\n"); - - device->streaming = enable; + /* low impedance: on, high impedance: off */ + error = tvp7002_write(sd, TVP7002_MISC_CTL_2, enable ? 0x00 : 0x03); + if (error) { + v4l2_dbg(1, debug, sd, "Fail to set streaming\n"); + return error; } - return error; + device->streaming = enable; + return 0; } /* |