summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-08 16:04:38 +0000
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-08 16:04:38 +0000
commitb884d16928248c316903c9b1f1483a3586228f65 (patch)
tree3494e803b779d1206123f18a89709e53df9f9a78
parent13a2a4d90910fc22d507fba16d54f6d5eb063013 (diff)
downloadmediapointer-dvb-s2-b884d16928248c316903c9b1f1483a3586228f65.tar.gz
mediapointer-dvb-s2-b884d16928248c316903c9b1f1483a3586228f65.tar.bz2
Fix pointer cast warnings in the ivtv framebuffer driver
From: David Howells <dhowells@redhat.com> 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>
-rw-r--r--linux/drivers/media/video/ivtv/ivtvfb.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtvfb.c b/linux/drivers/media/video/ivtv/ivtvfb.c
index 14f93341f..bdfda48e5 100644
--- a/linux/drivers/media/video/ivtv/ivtvfb.c
+++ b/linux/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;