Commit 8886a881 authored by Javier Martin's avatar Javier Martin Committed by Mauro Carvalho Chehab

[media] media: i.MX27 camera: fix compilation warning

Signed-off-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 665ad8af
...@@ -1200,7 +1200,9 @@ static struct soc_camera_host_ops mx2_soc_camera_host_ops = { ...@@ -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, static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
int bufnum, bool err) int bufnum, bool err)
{ {
#ifdef DEBUG
struct mx2_fmt_cfg *prp = pcdev->emma_prp; struct mx2_fmt_cfg *prp = pcdev->emma_prp;
#endif
struct mx2_buffer *buf; struct mx2_buffer *buf;
struct vb2_buffer *vb; struct vb2_buffer *vb;
unsigned long phys; unsigned long phys;
...@@ -1222,18 +1224,16 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, ...@@ -1222,18 +1224,16 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
if (prp->cfg.channel == 1) { if (prp->cfg.channel == 1) {
if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR + if (readl(pcdev->base_emma + PRP_DEST_RGB1_PTR +
4 * bufnum) != phys) { 4 * bufnum) != phys) {
dev_err(pcdev->dev, "%p != %p\n", phys, dev_err(pcdev->dev, "%lx != %x\n", phys,
readl(pcdev->base_emma + readl(pcdev->base_emma +
PRP_DEST_RGB1_PTR + PRP_DEST_RGB1_PTR + 4 * bufnum));
4 * bufnum));
} }
} else { } else {
if (readl(pcdev->base_emma + PRP_DEST_Y_PTR - if (readl(pcdev->base_emma + PRP_DEST_Y_PTR -
0x14 * bufnum) != phys) { 0x14 * bufnum) != phys) {
dev_err(pcdev->dev, "%p != %p\n", phys, dev_err(pcdev->dev, "%lx != %x\n", phys,
readl(pcdev->base_emma + readl(pcdev->base_emma +
PRP_DEST_Y_PTR - PRP_DEST_Y_PTR - 0x14 * bufnum));
0x14 * bufnum));
} }
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment