Message ID | 1355819321-21914-6-git-send-email-linux@prisktech.co.nz (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 12/18/2012 09:28 AM, Tony Prisk wrote: > Replace IS_ERR_OR_NULL with IS_ERR on clk_get results. > > Signed-off-by: Tony Prisk<linux@prisktech.co.nz> > CC: Kyungmin Park<kyungmin.park@samsung.com> > CC: Tomasz Stanislawski<t.stanislaws@samsung.com> > CC: linux-media@vger.kernel.org Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c index 0531ab7..3ac4da2 100644 --- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c @@ -730,7 +730,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;
Replace IS_ERR_OR_NULL with IS_ERR on clk_get results. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> CC: Kyungmin Park <kyungmin.park@samsung.com> CC: Tomasz Stanislawski <t.stanislaws@samsung.com> CC: linux-media@vger.kernel.org --- drivers/media/platform/s5p-fimc/fimc-mdevice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)