mirror of
https://github.com/torvalds/linux.git
synced 2024-12-12 14:12:51 +00:00
[media] s5p-g2d: Fix incorrect usage of IS_ERR_OR_NULL
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:
parent
d322bb9154
commit
15514fb567
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user