Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "This series contain:
   - new i2c video drivers: ml86v7667 (video decoder),
                            ths8200 (video encoder)
   - a new video driver for EasyCap cards based on Fushicai USBTV007
   - Improved support for OF and embedded systems, with V4L2 async
     initialization and a better support for clocks
   - API cleanups on the ioctls used by the v4l2 debug tool
   - Lots of cleanups
   - As usual, several driver improvements and new cards additions
   - Revert two changesets that change the minimal symbol rate for
     stv0399, as request by Manu
   - Update MAINTAINERS and other files to point to my new e-mail"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (378 commits)
  MAINTAINERS & ABI: Update to point to my new email
  [media] stb0899: restore minimal rate to 5Mbauds
  [media] exynos4-is: Correct colorspace handling at FIMC-LITE
  [media] exynos4-is: Set valid initial format on FIMC.n subdevs
  [media] exynos4-is: Set valid initial format on FIMC-IS-ISP subdev pads
  [media] exynos4-is: Fix format propagation on FIMC-IS-ISP subdev
  [media] exynos4-is: Set valid initial format at FIMC-LITE
  [media] exynos4-is: Fix format propagation on FIMC-LITE.n subdevs
  [media] MAINTAINERS: Update S5P/Exynos FIMC driver entry
  [media] Documentation: Update driver's directory in video4linux/fimc.txt
  [media] exynos4-is: Change fimc-is firmware file names
  [media] exynos4-is: Add support for Exynos5250 MIPI-CSIS
  [media] exynos4-is: Add Exynos5250 SoC support to fimc-lite driver
  [media] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms
  [media] media: i2c: tvp514x: remove manual setting of subdev name
  [media] media: i2c: tvp7002: remove manual setting of subdev name
  [media] mem2mem: set missing v4l2_dev pointer
  [media] wl128x: add missing struct v4l2_device
  [media] tvp514x: Fix init seqeunce
  [media] saa7134: Fix sparse warnings by adding __user annotation
  ...

5 files changed, 70 insertions, 20 deletions

diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index 4e86626dad4b..1b34c3629858 100644
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -576,16 +576,22 @@ static int hdmi_s_stream(struct v4l2_subdev *sd, int enable)
         return hdmi_streamoff(hdev);
 }
 
-static void hdmi_resource_poweron(struct hdmi_resources *res)
+static int hdmi_resource_poweron(struct hdmi_resources *res)
 {
+        int ret;
+
         /* turn HDMI power on */
-        regulator_bulk_enable(res->regul_count, res->regul_bulk);
+        ret = regulator_bulk_enable(res->regul_count, res->regul_bulk);
+        if (ret < 0)
+                return ret;
         /* power-on hdmi physical interface */
         clk_enable(res->hdmiphy);
         /* use VPP as parent clock; HDMIPHY is not working yet */
         clk_set_parent(res->sclk_hdmi, res->sclk_pixel);
         /* turn clocks on */
         clk_enable(res->sclk_hdmi);
+
+        return 0;
 }
 
 static void hdmi_resource_poweroff(struct hdmi_resources *res)
@@ -728,11 +734,13 @@ static int hdmi_runtime_resume(struct device *dev)
 {
         struct v4l2_subdev *sd = dev_get_drvdata(dev);
         struct hdmi_device *hdev = sd_to_hdmi_dev(sd);
-        int ret = 0;
+        int ret;
 
         dev_dbg(dev, "%s\n", __func__);
 
-        hdmi_resource_poweron(&hdev->res);
+        ret = hdmi_resource_poweron(&hdev->res);
+        if (ret < 0)
+                return ret;
 
         /* starting MHL */
         ret = v4l2_subdev_call(hdev->mhl_sd, core, s_power, 1);
@@ -755,6 +763,15 @@ static const struct dev_pm_ops hdmi_pm_ops = {
         .runtime_resume  = hdmi_runtime_resume,
 };
 
+static void hdmi_resource_clear_clocks(struct hdmi_resources *res)
+{
+        res->hdmi        = ERR_PTR(-EINVAL);
+        res->sclk_hdmi   = ERR_PTR(-EINVAL);
+        res->sclk_pixel  = ERR_PTR(-EINVAL);
+        res->sclk_hdmiphy = ERR_PTR(-EINVAL);
+        res->hdmiphy     = ERR_PTR(-EINVAL);
+}
+
 static void hdmi_resources_cleanup(struct hdmi_device *hdev)
 {
         struct hdmi_resources *res = &hdev->res;
@@ -765,17 +782,18 @@ static void hdmi_resources_cleanup(struct hdmi_device *hdev)
                 regulator_bulk_free(res->regul_count, res->regul_bulk);
         /* kfree is NULL-safe */
         kfree(res->regul_bulk);
-        if (!IS_ERR_OR_NULL(res->hdmiphy))
+        if (!IS_ERR(res->hdmiphy))
                 clk_put(res->hdmiphy);
-        if (!IS_ERR_OR_NULL(res->sclk_hdmiphy))
+        if (!IS_ERR(res->sclk_hdmiphy))
                 clk_put(res->sclk_hdmiphy);
-        if (!IS_ERR_OR_NULL(res->sclk_pixel))
+        if (!IS_ERR(res->sclk_pixel))
                 clk_put(res->sclk_pixel);
-        if (!IS_ERR_OR_NULL(res->sclk_hdmi))
+        if (!IS_ERR(res->sclk_hdmi))
                 clk_put(res->sclk_hdmi);
-        if (!IS_ERR_OR_NULL(res->hdmi))
+        if (!IS_ERR(res->hdmi))
                 clk_put(res->hdmi);
         memset(res, 0, sizeof(*res));
+        hdmi_resource_clear_clocks(res);
 }
 
 static int hdmi_resources_init(struct hdmi_device *hdev)
@@ -793,8 +811,9 @@ static int hdmi_resources_init(struct hdmi_device *hdev)
         dev_dbg(dev, "HDMI resource init\n");
 
         memset(res, 0, sizeof(*res));
-        /* get clocks, power */
+        hdmi_resource_clear_clocks(res);
 
+        /* get clocks, power */
         res->hdmi = clk_get(dev, "hdmi");
         if (IS_ERR(res->hdmi)) {
                 dev_err(dev, "failed to get clock 'hdmi'\n");
diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c
index 5733033a6ead..51805a5e2beb 100644
--- a/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -211,6 +211,15 @@ fail:
         return ret;
 }
 
+static void mxr_resource_clear_clocks(struct mxr_resources *res)
+{
+        res->mixer      = ERR_PTR(-EINVAL);
+        res->vp         = ERR_PTR(-EINVAL);
+        res->sclk_mixer = ERR_PTR(-EINVAL);
+        res->sclk_hdmi  = ERR_PTR(-EINVAL);
+        res->sclk_dac   = ERR_PTR(-EINVAL);
+}
+
 static void mxr_release_plat_resources(struct mxr_device *mdev)
 {
         free_irq(mdev->res.irq, mdev);
@@ -222,15 +231,15 @@ static void mxr_release_clocks(struct mxr_device *mdev)
 {
         struct mxr_resources *res = &mdev->res;
 
-        if (!IS_ERR_OR_NULL(res->sclk_dac))
+        if (!IS_ERR(res->sclk_dac))
                 clk_put(res->sclk_dac);
-        if (!IS_ERR_OR_NULL(res->sclk_hdmi))
+        if (!IS_ERR(res->sclk_hdmi))
                 clk_put(res->sclk_hdmi);
-        if (!IS_ERR_OR_NULL(res->sclk_mixer))
+        if (!IS_ERR(res->sclk_mixer))
                 clk_put(res->sclk_mixer);
-        if (!IS_ERR_OR_NULL(res->vp))
+        if (!IS_ERR(res->vp))
                 clk_put(res->vp);
-        if (!IS_ERR_OR_NULL(res->mixer))
+        if (!IS_ERR(res->mixer))
                 clk_put(res->mixer);
 }
 
@@ -239,6 +248,8 @@ static int mxr_acquire_clocks(struct mxr_device *mdev)
         struct mxr_resources *res = &mdev->res;
         struct device *dev = mdev->dev;
 
+        mxr_resource_clear_clocks(res);
+
         res->mixer = clk_get(dev, "mixer");
         if (IS_ERR(res->mixer)) {
                 mxr_err(mdev, "failed to get clock 'mixer'\n");
@@ -299,6 +310,7 @@ static void mxr_release_resources(struct mxr_device *mdev)
         mxr_release_clocks(mdev);
         mxr_release_plat_resources(mdev);
         memset(&mdev->res, 0, sizeof(mdev->res));
+        mxr_resource_clear_clocks(&mdev->res);
 }
 
 static void mxr_release_layers(struct mxr_device *mdev)
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index ef0efdf422fe..641b1f071e06 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -81,8 +81,9 @@ int mxr_acquire_video(struct mxr_device *mdev,
         }
 
         mdev->alloc_ctx = vb2_dma_contig_init_ctx(mdev->dev);
-        if (IS_ERR_OR_NULL(mdev->alloc_ctx)) {
+        if (IS_ERR(mdev->alloc_ctx)) {
                 mxr_err(mdev, "could not acquire vb2 allocator\n");
+                ret = PTR_ERR(mdev->alloc_ctx);
                 goto fail_v4l2_dev;
         }
 
diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c
index ab6f9ef89423..0afa90f0f6ab 100644
--- a/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -262,11 +262,21 @@ static int sdo_runtime_resume(struct device *dev)
 {
         struct v4l2_subdev *sd = dev_get_drvdata(dev);
         struct sdo_device *sdev = sd_to_sdev(sd);
+        int ret;
 
         dev_info(dev, "resume\n");
-        clk_enable(sdev->sclk_dac);
-        regulator_enable(sdev->vdac);
-        regulator_enable(sdev->vdet);
+
+        ret = clk_enable(sdev->sclk_dac);
+        if (ret < 0)
+                return ret;
+
+        ret = regulator_enable(sdev->vdac);
+        if (ret < 0)
+                goto dac_clk_dis;
+
+        ret = regulator_enable(sdev->vdet);
+        if (ret < 0)
+                goto vdac_r_dis;
 
         /* software reset */
         sdo_write_mask(sdev, SDO_CLKCON, ~0, SDO_TVOUT_SW_RESET);
@@ -285,6 +295,12 @@ static int sdo_runtime_resume(struct device *dev)
                 SDO_COMPENSATION_CVBS_COMP_OFF);
         sdo_reg_debug(sdev);
         return 0;
+
+vdac_r_dis:
+        regulator_disable(sdev->vdac);
+dac_clk_dis:
+        clk_disable(sdev->sclk_dac);
+        return ret;
 }
 
 static const struct dev_pm_ops sdo_pm_ops = {
diff --git a/drivers/media/platform/s5p-tv/sii9234_drv.c b/drivers/media/platform/s5p-tv/sii9234_drv.c
index 39b77d24b9c2..3dd762e5b67e 100644
--- a/drivers/media/platform/s5p-tv/sii9234_drv.c
+++ b/drivers/media/platform/s5p-tv/sii9234_drv.c
@@ -249,7 +249,9 @@ static int sii9234_runtime_resume(struct device *dev)
         int ret;
 
         dev_info(dev, "resume start\n");
-        regulator_enable(ctx->power);
+        ret = regulator_enable(ctx->power);
+        if (ret < 0)
+                return ret;
 
         ret = sii9234_reset(ctx);
         if (ret)