diff options
| author | Javier Martin <javier.martin@vista-silicon.com> | 2012-02-13 18:40:01 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-08 16:46:55 +0400 |
| commit | 8886a881e2379565808eacbadd129120967e3539 (patch) | |
| tree | 36ce6a41de0bcc1e9fecece923e6ebe108c29509 /drivers/media/video/mx2_camera.c | |
| parent | 665ad8af8f93ed9b54e99f37e24def6f623698c6 (diff) | |
| download | linux-8886a881e2379565808eacbadd129120967e3539.tar.xz | |
[media] media: i.MX27 camera: fix compilation warning
Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mx2_camera.c')
| -rw-r--r-- | drivers/media/video/mx2_camera.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 1a8e4676c8a7..1f7e36c2116e 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -1200,7 +1200,9 @@ static struct soc_camera_host_ops mx2_soc_camera_host_ops = { static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, int bufnum, bool err) { +#ifdef DEBUG struct mx2_fmt_cfg *prp = pcdev->emma_prp; +#endif struct mx2_buffer *buf; struct vb2_buffer *vb; unsigned long phys; @@ -1222,18 +1224,16 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, if (prp->cfg.channel == 1) { if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR + 4 * bufnum) != phys) { - dev_err(pcdev->dev, "%p != %p\n", phys, - readl(pcdev->base_emma + - PRP_DEST_RGB1_PTR + - 4 * bufnum)); + dev_err(pcdev->dev, "%lx != %x\n", phys, + readl(pcdev->base_emma + + PRP_DEST_RGB1_PTR + 4 * bufnum)); } } else { if (readl(pcdev->base_emma + PRP_DEST_Y_PTR - 0x14 * bufnum) != phys) { - dev_err(pcdev->dev, "%p != %p\n", phys, - readl(pcdev->base_emma + - PRP_DEST_Y_PTR - - 0x14 * bufnum)); + dev_err(pcdev->dev, "%lx != %x\n", phys, + readl(pcdev->base_emma + + PRP_DEST_Y_PTR - 0x14 * bufnum)); } } #endif |