diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_hw.c | 4 | ||||
| -rw-r--r-- | linux/include/media/saa7146.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_hw.c b/linux/drivers/media/dvb/ttpci/av7110_hw.c index 45de1f8ee..754bb8140 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_hw.c +++ b/linux/drivers/media/dvb/ttpci/av7110_hw.c @@ -999,11 +999,11 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) case OSD_SetPalette: { if (FW_VERSION(av7110->arm_app) >= 0x2618) { - ret = OSDSetPalette(av7110, (u32 *)dc->data, dc->color, dc->x0); + ret = OSDSetPalette(av7110, dc->data, dc->color, dc->x0); goto out; } else { int i, len = dc->x0-dc->color+1; - u8 *colors = (u8 *)dc->data; + u8 __user *colors = (u8 *)dc->data; u8 r, g, b, blend; for (i = 0; i<len; i++) { diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index 38667239f..2265e8f45 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -137,7 +137,7 @@ struct saa7146_dev spinlock_t slock; struct semaphore lock; - unsigned char *mem; /* pointer to mapped IO memory */ + unsigned char __iomem *mem; /* pointer to mapped IO memory */ int revision; /* chip revision; needed for bug-workarounds*/ /* pci-device & irq stuff*/ |