aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-tv
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-06-10 07:54:30 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-12 21:17:47 -0400
commitd285837eaf5e363ac0ab1bf6deb110e007325949 (patch)
treed72257ea5594dfc13894af902458e465cedc8fed /drivers/media/platform/s5p-tv
parent984b248f6bdcd0b319e84e43f0be532f989c709a (diff)
[media] s5p-tv: Do not ignore regulator/clk API return values in sdo_drv.c
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>
Diffstat (limited to 'drivers/media/platform/s5p-tv')
-rw-r--r--drivers/media/platform/s5p-tv/sdo_drv.c22
1 files changed, 19 insertions, 3 deletions
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)
262{ 262{
263 struct v4l2_subdev *sd = dev_get_drvdata(dev); 263 struct v4l2_subdev *sd = dev_get_drvdata(dev);
264 struct sdo_device *sdev = sd_to_sdev(sd); 264 struct sdo_device *sdev = sd_to_sdev(sd);
265 int ret;
265 266
266 dev_info(dev, "resume\n"); 267 dev_info(dev, "resume\n");
267 clk_enable(sdev->sclk_dac); 268
268 regulator_enable(sdev->vdac); 269 ret = clk_enable(sdev->sclk_dac);
269 regulator_enable(sdev->vdet); 270 if (ret < 0)
271 return ret;
272
273 ret = regulator_enable(sdev->vdac);
274 if (ret < 0)
275 goto dac_clk_dis;
276
277 ret = regulator_enable(sdev->vdet);
278 if (ret < 0)
279 goto vdac_r_dis;
270 280
271 /* software reset */ 281 /* software reset */
272 sdo_write_mask(sdev, SDO_CLKCON, ~0, SDO_TVOUT_SW_RESET); 282 sdo_write_mask(sdev, SDO_CLKCON, ~0, SDO_TVOUT_SW_RESET);
@@ -285,6 +295,12 @@ static int sdo_runtime_resume(struct device *dev)
285 SDO_COMPENSATION_CVBS_COMP_OFF); 295 SDO_COMPENSATION_CVBS_COMP_OFF);
286 sdo_reg_debug(sdev); 296 sdo_reg_debug(sdev);
287 return 0; 297 return 0;
298
299vdac_r_dis:
300 regulator_disable(sdev->vdac);
301dac_clk_dis:
302 clk_disable(sdev->sclk_dac);
303 return ret;
288} 304}
289 305
290static const struct dev_pm_ops sdo_pm_ops = { 306static const struct dev_pm_ops sdo_pm_ops = {