aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-tv
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2013-06-10 07:54:48 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-12 21:17:59 -0400
commit62d54876c511628daed2246753e2fe348da022f1 (patch)
treeca4056d21ddef62da24edf2da86408576c3c9de1 /drivers/media/platform/s5p-tv
parentd285837eaf5e363ac0ab1bf6deb110e007325949 (diff)
[media] s5p-tv: Don't ignore return value of regulator_bulk_enable() in hdmi_drv.c
This patch fixes following compilation warning: CC [M] drivers/media/platform/s5p-tv/hdmi_drv.o drivers/media/platform/s5p-tv/hdmi_drv.c: In function ‘hdmi_resource_poweron’: drivers/media/platform/s5p-tv/hdmi_drv.c:583:23: warning: ignoring return value of ‘regulator_bulk_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/hdmi_drv.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index cd525f193240..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)
576 return hdmi_streamoff(hdev); 576 return hdmi_streamoff(hdev);
577} 577}
578 578
579static void hdmi_resource_poweron(struct hdmi_resources *res) 579static int hdmi_resource_poweron(struct hdmi_resources *res)
580{ 580{
581 int ret;
582
581 /* turn HDMI power on */ 583 /* turn HDMI power on */
582 regulator_bulk_enable(res->regul_count, res->regul_bulk); 584 ret = regulator_bulk_enable(res->regul_count, res->regul_bulk);
585 if (ret < 0)
586 return ret;
583 /* power-on hdmi physical interface */ 587 /* power-on hdmi physical interface */
584 clk_enable(res->hdmiphy); 588 clk_enable(res->hdmiphy);
585 /* use VPP as parent clock; HDMIPHY is not working yet */ 589 /* use VPP as parent clock; HDMIPHY is not working yet */
586 clk_set_parent(res->sclk_hdmi, res->sclk_pixel); 590 clk_set_parent(res->sclk_hdmi, res->sclk_pixel);
587 /* turn clocks on */ 591 /* turn clocks on */
588 clk_enable(res->sclk_hdmi); 592 clk_enable(res->sclk_hdmi);
593
594 return 0;
589} 595}
590 596
591static void hdmi_resource_poweroff(struct hdmi_resources *res) 597static void hdmi_resource_poweroff(struct hdmi_resources *res)
@@ -728,11 +734,13 @@ static int hdmi_runtime_resume(struct device *dev)
728{ 734{
729 struct v4l2_subdev *sd = dev_get_drvdata(dev); 735 struct v4l2_subdev *sd = dev_get_drvdata(dev);
730 struct hdmi_device *hdev = sd_to_hdmi_dev(sd); 736 struct hdmi_device *hdev = sd_to_hdmi_dev(sd);
731 int ret = 0; 737 int ret;
732 738
733 dev_dbg(dev, "%s\n", __func__); 739 dev_dbg(dev, "%s\n", __func__);
734 740
735 hdmi_resource_poweron(&hdev->res); 741 ret = hdmi_resource_poweron(&hdev->res);
742 if (ret < 0)
743 return ret;
736 744
737 /* starting MHL */ 745 /* starting MHL */
738 ret = v4l2_subdev_call(hdev->mhl_sd, core, s_power, 1); 746 ret = v4l2_subdev_call(hdev->mhl_sd, core, s_power, 1);