FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-29 04:45:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[media] tvp7002: Don't update device->streaming if write to register fails

Browse Source 
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>
This commit is contained in:
Axel Lin 2014-08-16 03:57:30 -03:00 committed by Mauro Carvalho Chehab
parent a0ffe4c090
commit 18cb650338
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/i2c/tvp7002.c
View File

@ -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) static int tvp7002_s_stream(struct v4l2_subdev *sd, int enable)
{ {
struct tvp7002 *device = to_tvp7002(sd); struct tvp7002 *device = to_tvp7002(sd);
int error = 0; int error;
if (device->streaming == enable) if (device->streaming == enable)
return 0; return 0;
if (enable) { /* low impedance: on, high impedance: off */
/* Set output state on (low impedance means stream on) */ error = tvp7002_write(sd, TVP7002_MISC_CTL_2, enable ? 0x00 : 0x03);
error = tvp7002_write(sd, TVP7002_MISC_CTL_2, 0x00); if (error) {
device->streaming = enable; v4l2_dbg(1, debug, sd, "Fail to set streaming\n");
} else { return error;
/* 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;
} }
return error; device->streaming = enable;
return 0;
} }
/* /*