[media] s5p-fimc: Fix incorrect usage of IS_ERR_OR_NULL
authorTony Prisk <linux@prisktech.co.nz>
Tue, 18 Dec 2012 08:28:40 +0000 (05:28 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 6 Jan 2013 11:25:41 +0000 (09:25 -0200)
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>
drivers/media/platform/s5p-fimc/fimc-mdevice.c

index e77dba7a97b84e66d15c07ec749fdaa44d7f0e26..25055cb43993864854eac1668ab04a8799b74a4f 100644 (file)
@@ -732,7 +732,7 @@ static int fimc_md_get_clocks(struct fimc_md *fmd)
        for (i = 0; i < FIMC_MAX_CAMCLKS; i++) {
                snprintf(clk_name, sizeof(clk_name), "sclk_cam%u", i);
                clock = clk_get(NULL, clk_name);
-               if (IS_ERR_OR_NULL(clock)) {
+               if (IS_ERR(clock)) {
                        v4l2_err(&fmd->v4l2_dev, "Failed to get clock: %s",
                                  clk_name);
                        return -ENXIO;