[PATCH 6/6] clk: s5p-g2d: Fix incorrect usage of IS_ERR_OR_NULL

[Tony Prisk]

Replace IS_ERR_OR_NULL with IS_ERR on clk_get results.

Signed-off-by: Tony Prisk <li...@prisktech.co.nz>
CC: Kyungmin Park <kyungmin.p...@samsung.com>
CC: Tomasz Stanislawski <t.stanisl...@samsung.com>
CC: linux-media@vger.kernel.org
---
 drivers/media/platform/s5p-g2d/g2d.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/s5p-g2d/g2d.c 
b/drivers/media/platform/s5p-g2d/g2d.c
index 1bfbc32..dcd5335 100644
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -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;
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html