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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Axel,

Thanks for the patch!

On Sat, Aug 16, 2014 at 7:57 AM, Axel Lin <axel.lin@xxxxxxxxxx> wrote:
> This ensures device->streaming has correct status.
>
> Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>

Acked-By: Lad, Prabhakar <prabhakar.csengg@xxxxxxxxx>

Regards,
--Prabhakar Lad

> ---
>  drivers/media/i2c/tvp7002.c | 21 ++++++++-------------
>  1 file changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
> index 11f2387..51bac76 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;
>  }
>
>  /*
> --
> 1.9.1
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux