[media] s5p-tv: Do not ignore regulator/clk API return values in sdo_drv.c
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Mon, 10 Jun 2013 11:54:30 +0000 (08:54 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 13 Jun 2013 01:17:47 +0000 (22:17 -0300)
This patch fixes following compilation warning:
drivers/media/platform/s5p-tv/sdo_drv.c: In function ‘sdo_runtime_resume’:
drivers/media/platform/s5p-tv/sdo_drv.c:268:18: warning: ignoring return value of ‘regulator_enable’,
  declared with attribute warn_unused_result
drivers/media/platform/s5p-tv/sdo_drv.c:269:18: warning: ignoring return value of ‘regulator_enable’,
  declared with attribute warn_unused_result

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/s5p-tv/sdo_drv.c

index ab6f9ef8942332c854633024bd58399206cad61e..0afa90f0f6abfdfd8aee75981c147608b9c1262e 100644 (file)
@@ -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 = {