From 9f39a6b4aa4aa99be7dd0fd65033b0b9ac15ddff Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Fri, 11 Feb 2011 12:33:06 -0300 Subject: [PATCH] --- yaml --- r: 242061 b: refs/heads/master c: a0f8caefaf3295721ef00415c7d63ec10af253ab h: refs/heads/master i: 242059: 04988d9b3f6fe7952dd0241b583632644ee3eaa4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-fimc/fimc-capture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1096497b63bb..63edd6b1da4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ec737ffccd7fab629e28427b4d0581ce62ffedd +refs/heads/master: a0f8caefaf3295721ef00415c7d63ec10af253ab diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c index 6b6f72e4066c..423931c0cfe5 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/trunk/drivers/media/video/s5p-fimc/fimc-capture.c @@ -98,7 +98,7 @@ static int fimc_subdev_attach(struct fimc_dev *fimc, int index) continue; sd = fimc_subdev_register(fimc, isp_info); - if (sd) { + if (!IS_ERR_OR_NULL(sd)) { vid_cap->sd = sd; vid_cap->input_index = i;