Commit 62d54876 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab

[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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d285837e
...@@ -576,16 +576,22 @@ static int hdmi_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -576,16 +576,22 @@ static int hdmi_s_stream(struct v4l2_subdev *sd, int enable)
return hdmi_streamoff(hdev); 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 */ /* 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 */ /* power-on hdmi physical interface */
clk_enable(res->hdmiphy); clk_enable(res->hdmiphy);
/* use VPP as parent clock; HDMIPHY is not working yet */ /* use VPP as parent clock; HDMIPHY is not working yet */
clk_set_parent(res->sclk_hdmi, res->sclk_pixel); clk_set_parent(res->sclk_hdmi, res->sclk_pixel);
/* turn clocks on */ /* turn clocks on */
clk_enable(res->sclk_hdmi); clk_enable(res->sclk_hdmi);
return 0;
} }
static void hdmi_resource_poweroff(struct hdmi_resources *res) static void hdmi_resource_poweroff(struct hdmi_resources *res)
...@@ -728,11 +734,13 @@ static int hdmi_runtime_resume(struct device *dev) ...@@ -728,11 +734,13 @@ static int hdmi_runtime_resume(struct device *dev)
{ {
struct v4l2_subdev *sd = dev_get_drvdata(dev); struct v4l2_subdev *sd = dev_get_drvdata(dev);
struct hdmi_device *hdev = sd_to_hdmi_dev(sd); struct hdmi_device *hdev = sd_to_hdmi_dev(sd);
int ret = 0; int ret;
dev_dbg(dev, "%s\n", __func__); dev_dbg(dev, "%s\n", __func__);
hdmi_resource_poweron(&hdev->res); ret = hdmi_resource_poweron(&hdev->res);
if (ret < 0)
return ret;
/* starting MHL */ /* starting MHL */
ret = v4l2_subdev_call(hdev->mhl_sd, core, s_power, 1); ret = v4l2_subdev_call(hdev->mhl_sd, core, s_power, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment