From 7a0a4a1e7e999f192bd81a1bee44c7b2ef0d9551 Mon Sep 17 00:00:00 2001 From: Javier Martin Date: Mon, 13 Feb 2012 11:40:01 -0300 Subject: [PATCH] --- yaml --- r: 295009 b: refs/heads/master c: 8886a881e2379565808eacbadd129120967e3539 h: refs/heads/master i: 295007: bfc35be36ed0cdb8aa0429be1c089824c3bd34d7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx2_camera.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index af2879ebc858..ca677bbd6192 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 665ad8af8f93ed9b54e99f37e24def6f623698c6 +refs/heads/master: 8886a881e2379565808eacbadd129120967e3539 diff --git a/trunk/drivers/media/video/mx2_camera.c b/trunk/drivers/media/video/mx2_camera.c index 1a8e4676c8a7..1f7e36c2116e 100644 --- a/trunk/drivers/media/video/mx2_camera.c +++ b/trunk/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