Commit 44048752 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-tv: Fix incorrect usage of IS_ERR_OR_NULL in hdmi_drv.c 



NULL check on clocks obtained using common clock APIs should not
be done. Use IS_ERR only.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 793ad32d

drivers/media/platform/s5p-tv/hdmi_drv.c

+17 −6
Original line number Diff line number Diff line
@@ -755,6 +755,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 +774,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 +803,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");