From: David Howells Date: Tue, 8 Jul 2008 19:04:38 +0000 (-0300) Subject: V4L/DVB (8249): Fix pointer cast warnings in the ivtv framebuffer driver X-Git-Tag: v2.6.27-rc1~966^2~122 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fce3fb0592841857ae01334d0c6934c1ad32faf;p=linux-2.6 V4L/DVB (8249): Fix pointer cast warnings in the ivtv framebuffer driver 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 14f93341f0..bdfda48e56 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c @@ -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;