summaryrefslogtreecommitdiff
path: root/drivers/media/video/s5p-fimc/fimc-reg.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-06-12 10:12:26 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-31 02:23:01 +0400
commita516d08fa6afb703ba508ccc55656d037c5b9e2e (patch)
tree742438b6d8e0a1d9694f1fe716f8c041a22ef5d9 /drivers/media/video/s5p-fimc/fimc-reg.c
parentc2d430af08f38a0b3145c3b60381146b8ac88c88 (diff)
downloadlinux-a516d08fa6afb703ba508ccc55656d037c5b9e2e.tar.xz
[media] s5p-fimc: Replace custom err() macro with v4l2_err() macro
Replace custom err() macro with v4l2_err() macro. [s.nawrocki: added missing end-of-line at the log print] Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-reg.c')
-rw-r--r--drivers/media/video/s5p-fimc/fimc-reg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c
index 1fc4ce8446f5..74a2fba2c543 100644
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -683,8 +683,8 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
break;
default:
- v4l2_err(fimc->vid_cap.vfd,
- "Not supported camera pixel format: %d",
+ v4l2_err(vid_cap->vfd,
+ "Not supported camera pixel format: %#x\n",
vid_cap->mf.code);
return -EINVAL;
}
@@ -699,7 +699,7 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
} else if (cam->bus_type == FIMC_LCD_WB) {
cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB;
} else {
- err("invalid camera bus type selected\n");
+ v4l2_err(vid_cap->vfd, "Invalid camera bus type selected\n");
return -EINVAL;
}
writel(cfg, fimc->regs + FIMC_REG_CIGCTRL);