diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-12 11:34:38 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-12 11:34:38 +0200 |
| commit | 5d9abf072da54a382d318a6a23bc4d65d1c9f6a7 (patch) | |
| tree | 0091520c14854a60961fc21d8942a1cf32ffa56b /linux/drivers/media/video/ivtv | |
| parent | 0b44aa87bd1a08f0c6c64872413937415f5cc7e9 (diff) | |
| parent | 5d6597046c8d57aa650a06343c4d63ba7dbe57dc (diff) | |
| download | mediapointer-dvb-s2-5d9abf072da54a382d318a6a23bc4d65d1c9f6a7.tar.gz mediapointer-dvb-s2-5d9abf072da54a382d318a6a23bc4d65d1c9f6a7.tar.bz2 | |
merge: from v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/ivtv')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtvfb.c | 7 |
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; |