Skip to content

Commit

Permalink
[media] s5p-g2d: Fix incorrect usage of IS_ERR_OR_NULL
Browse files Browse the repository at this point in the history
Replace IS_ERR_OR_NULL with IS_ERR on clk_get results.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Tony Prisk authored and Mauro Carvalho Chehab committed Jan 6, 2013
1 parent d322bb9 commit 15514fb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/platform/s5p-g2d/g2d.c
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ static int g2d_probe(struct platform_device *pdev)
}

dev->clk = clk_get(&pdev->dev, "sclk_fimg2d");
if (IS_ERR_OR_NULL(dev->clk)) {
if (IS_ERR(dev->clk)) {
dev_err(&pdev->dev, "failed to get g2d clock\n");
return -ENXIO;
}
Expand All @@ -727,7 +727,7 @@ static int g2d_probe(struct platform_device *pdev)
}

dev->gate = clk_get(&pdev->dev, "fimg2d");
if (IS_ERR_OR_NULL(dev->gate)) {
if (IS_ERR(dev->gate)) {
dev_err(&pdev->dev, "failed to get g2d clock gate\n");
ret = -ENXIO;
goto unprep_clk;
Expand Down

0 comments on commit 15514fb

Please sign in to comment.