Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] s5p-g2d: Fix incorrect usage of IS_ERR_OR_NULL

Browse Source 
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>
This commit is contained in:
Tony Prisk 2012-12-18 05:28:41 -03:00 committed by Mauro Carvalho Chehab
parent d322bb9154
commit 15514fb567
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/s5p-g2d/g2d.c
View File

@ -715,7 +715,7 @@ static int g2d_probe(struct platform_device *pdev)
} }
dev->clk = clk_get(&pdev->dev, "sclk_fimg2d"); 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"); dev_err(&pdev->dev, "failed to get g2d clock\n");
return -ENXIO; return -ENXIO;
} }
@ -727,7 +727,7 @@ static int g2d_probe(struct platform_device *pdev)
} }
dev->gate = clk_get(&pdev->dev, "fimg2d"); 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"); dev_err(&pdev->dev, "failed to get g2d clock gate\n");
ret = -ENXIO; ret = -ENXIO;
goto unprep_clk; goto unprep_clk;