diff options
author | David Howells <dhowells@redhat.com> | 2008-07-08 15:04:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:18:58 -0400 |
commit | 3fce3fb0592841857ae01334d0c6934c1ad32faf (patch) | |
tree | 4cca44cf9493b288bc3813caaa4df50a5ed26a8a /drivers/media/video/ivtv | |
parent | 5a367dfb739831d54caf226ce0bc4c75ef264d8d (diff) |
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 <dhowells@redhat.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r-- | drivers/media/video/ivtv/ivtvfb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 14f93341f061..bdfda48e56bf 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, | |||
417 | if (!err) { | 417 | if (!err) { |
418 | /* If transfer size > threshold and both src/dst | 418 | /* If transfer size > threshold and both src/dst |
419 | addresses are aligned, use DMA */ | 419 | addresses are aligned, use DMA */ |
420 | if (count >= 4096 && ((u32)buf & 3) == ((u32)dst & 3)) { | 420 | if (count >= 4096 && |
421 | ((unsigned long)buf & 3) == ((unsigned long)dst & 3)) { | ||
421 | /* Odd address = can't DMA. Align */ | 422 | /* Odd address = can't DMA. Align */ |
422 | if ((u32)dst & 3) { | 423 | if ((unsigned long)dst & 3) { |
423 | lead = 4 - ((u32)dst & 3); | 424 | lead = 4 - ((unsigned long)dst & 3); |
424 | memcpy(dst, buf, lead); | 425 | memcpy(dst, buf, lead); |
425 | buf += lead; | 426 | buf += lead; |
426 | dst += lead; | 427 | dst += lead; |