diff options
| -rw-r--r-- | drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 7 | ||||
| -rw-r--r-- | drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c index 31e12f1506cb..a4e3f9a6b2ff 100644 --- a/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c +++ b/drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c @@ -182,14 +182,13 @@ static int sun6i_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on) unsigned int lanes_count = csi2_dev->bridge.endpoint.bus.mipi_csi2.num_data_lanes; unsigned long pixel_rate; - /* Initialize to 0 to use both in disable label (ret != 0) and off. */ - int ret = 0; + int ret; if (!source_subdev) return -ENODEV; if (!on) { - v4l2_subdev_call(source_subdev, video, s_stream, 0); + ret = v4l2_subdev_call(source_subdev, video, s_stream, 0); goto disable; } @@ -281,6 +280,8 @@ static int sun6i_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on) return 0; disable: + if (!on) + ret = 0; phy_power_off(dphy); sun6i_mipi_csi2_disable(csi2_dev); diff --git a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c index c82ede3ca0ff..d052ee77ef0a 100644 --- a/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c +++ b/drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c @@ -214,14 +214,13 @@ static int sun8i_a83t_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on) unsigned int lanes_count = csi2_dev->bridge.endpoint.bus.mipi_csi2.num_data_lanes; unsigned long pixel_rate; - /* Initialize to 0 to use both in disable label (ret != 0) and off. */ - int ret = 0; + int ret; if (!source_subdev) return -ENODEV; if (!on) { - v4l2_subdev_call(source_subdev, video, s_stream, 0); + ret = v4l2_subdev_call(source_subdev, video, s_stream, 0); goto disable; } @@ -313,6 +312,8 @@ static int sun8i_a83t_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on) return 0; disable: + if (!on) + ret = 0; phy_power_off(dphy); sun8i_a83t_mipi_csi2_disable(csi2_dev); |