]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (8249): Fix pointer cast warnings in the ivtv framebuffer driver
authorDavid Howells <dhowells@redhat.com>
Tue, 8 Jul 2008 19:04:38 +0000 (16:04 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 20 Jul 2008 10:18:58 +0000 (07:18 -0300)
Fix casts of pointers to integers of different sizes in the ivtv framebuffer
driver.

These were introduced in patch 38eb6ba5b8487d15b020fe391d324edd2b659b03.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/ivtv/ivtvfb.c

index 14f93341f061ee0bb446ee502d6ec247bb8a6ff8..bdfda48e56bf55e0b5ea3af83404348053fd26b8 100644 (file)
@@ -417,10 +417,11 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
        if (!err) {
                /* If transfer size > threshold and both src/dst
                addresses are aligned, use DMA */
-               if (count >= 4096 && ((u32)buf & 3) == ((u32)dst & 3)) {
+               if (count >= 4096 &&
+                   ((unsigned long)buf & 3) == ((unsigned long)dst & 3)) {
                        /* Odd address = can't DMA. Align */
-                       if ((u32)dst & 3) {
-                               lead = 4 - ((u32)dst & 3);
+                       if ((unsigned long)dst & 3) {
+                               lead = 4 - ((unsigned long)dst & 3);
                                memcpy(dst, buf, lead);
                                buf += lead;
                                dst += lead;