iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
NULL check on clocks obtained using common clock APIs should not
be done. Use IS_ERR only.
[s.nawrocki: removed unrelated whitespace change]

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sachin Kamat 2013-05-17 00:31:02 -03:00 committed by Mauro Carvalho Chehab
parent 4404875234
commit 0781c057e3
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/platform/s5p-tv/mixer_drv.c
View File

@ -211,6 +211,15 @@ fail:
return ret; return ret;
} }
static void mxr_resource_clear_clocks(struct mxr_resources *res)
{
res->mixer = ERR_PTR(-EINVAL);
res->vp = ERR_PTR(-EINVAL);
res->sclk_mixer = ERR_PTR(-EINVAL);
res->sclk_hdmi = ERR_PTR(-EINVAL);
res->sclk_dac = ERR_PTR(-EINVAL);
}
static void mxr_release_plat_resources(struct mxr_device *mdev) static void mxr_release_plat_resources(struct mxr_device *mdev)
{ {
free_irq(mdev->res.irq, mdev); free_irq(mdev->res.irq, mdev);
@ -222,15 +231,15 @@ static void mxr_release_clocks(struct mxr_device *mdev)
{ {
struct mxr_resources *res = &mdev->res; struct mxr_resources *res = &mdev->res;
if (!IS_ERR_OR_NULL(res->sclk_dac)) if (!IS_ERR(res->sclk_dac))
clk_put(res->sclk_dac); clk_put(res->sclk_dac);
if (!IS_ERR_OR_NULL(res->sclk_hdmi)) if (!IS_ERR(res->sclk_hdmi))
clk_put(res->sclk_hdmi); clk_put(res->sclk_hdmi);
if (!IS_ERR_OR_NULL(res->sclk_mixer)) if (!IS_ERR(res->sclk_mixer))
clk_put(res->sclk_mixer); clk_put(res->sclk_mixer);
if (!IS_ERR_OR_NULL(res->vp)) if (!IS_ERR(res->vp))
clk_put(res->vp); clk_put(res->vp);
if (!IS_ERR_OR_NULL(res->mixer)) if (!IS_ERR(res->mixer))
clk_put(res->mixer); clk_put(res->mixer);
} }
@ -239,6 +248,8 @@ static int mxr_acquire_clocks(struct mxr_device *mdev)
struct mxr_resources *res = &mdev->res; struct mxr_resources *res = &mdev->res;
struct device *dev = mdev->dev; struct device *dev = mdev->dev;
mxr_resource_clear_clocks(res);
res->mixer = clk_get(dev, "mixer"); res->mixer = clk_get(dev, "mixer");
if (IS_ERR(res->mixer)) { if (IS_ERR(res->mixer)) {
mxr_err(mdev, "failed to get clock 'mixer'\n"); mxr_err(mdev, "failed to get clock 'mixer'\n");
@ -299,6 +310,7 @@ static void mxr_release_resources(struct mxr_device *mdev)
mxr_release_clocks(mdev); mxr_release_clocks(mdev);
mxr_release_plat_resources(mdev); mxr_release_plat_resources(mdev);
memset(&mdev->res, 0, sizeof(mdev->res)); memset(&mdev->res, 0, sizeof(mdev->res));
mxr_resource_clear_clocks(&mdev->res);
} }
static void mxr_release_layers(struct mxr_device *mdev) static void mxr_release_layers(struct mxr_device *mdev)