diff options
author | Javier Martin <javier.martin@vista-silicon.com> | 2012-02-13 09:40:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-08 07:46:55 -0500 |
commit | 8886a881e2379565808eacbadd129120967e3539 (patch) | |
tree | 36ce6a41de0bcc1e9fecece923e6ebe108c29509 /drivers/media | |
parent | 665ad8af8f93ed9b54e99f37e24def6f623698c6 (diff) |
[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')
-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 = { | |||
1200 | static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, | 1200 | static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, |
1201 | int bufnum, bool err) | 1201 | int bufnum, bool err) |
1202 | { | 1202 | { |
1203 | #ifdef DEBUG | ||
1203 | struct mx2_fmt_cfg *prp = pcdev->emma_prp; | 1204 | struct mx2_fmt_cfg *prp = pcdev->emma_prp; |
1205 | #endif | ||
1204 | struct mx2_buffer *buf; | 1206 | struct mx2_buffer *buf; |
1205 | struct vb2_buffer *vb; | 1207 | struct vb2_buffer *vb; |
1206 | unsigned long phys; | 1208 | unsigned long phys; |
@@ -1222,18 +1224,16 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, | |||
1222 | if (prp->cfg.channel == 1) { | 1224 | if (prp->cfg.channel == 1) { |
1223 | if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR + | 1225 | if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR + |
1224 | 4 * bufnum) != phys) { | 1226 | 4 * bufnum) != phys) { |
1225 | dev_err(pcdev->dev, "%p != %p\n", phys, | 1227 | dev_err(pcdev->dev, "%lx != %x\n", phys, |
1226 | readl(pcdev->base_emma + | 1228 | readl(pcdev->base_emma + |
1227 | PRP_DEST_RGB1_PTR + | 1229 | PRP_DEST_RGB1_PTR + 4 * bufnum)); |
1228 | 4 * bufnum)); | ||
1229 | } | 1230 | } |
1230 | } else { | 1231 | } else { |
1231 | if (readl(pcdev->base_emma + PRP_DEST_Y_PTR - | 1232 | if (readl(pcdev->base_emma + PRP_DEST_Y_PTR - |
1232 | 0x14 * bufnum) != phys) { | 1233 | 0x14 * bufnum) != phys) { |
1233 | dev_err(pcdev->dev, "%p != %p\n", phys, | 1234 | dev_err(pcdev->dev, "%lx != %x\n", phys, |
1234 | readl(pcdev->base_emma + | 1235 | readl(pcdev->base_emma + |
1235 | PRP_DEST_Y_PTR - | 1236 | PRP_DEST_Y_PTR - 0x14 * bufnum)); |
1236 | 0x14 * bufnum)); | ||
1237 | } | 1237 | } |
1238 | } | 1238 | } |
1239 | #endif | 1239 | #endif |