From d3c7341869a8188aff16975a785c4c5d05c3fcb8 Mon Sep 17 00:00:00 2001 From: Johannes Stezenbach Date: Sat, 31 Jul 2004 00:05:45 +0000 Subject: merge back various cleanups from mainline kernel: - sparse annotiations (viro) - NULL noise removal (viro) - #if where #ifdef should've been (saa7146) (viro) - convert private ABS() to kernel's abs() (rddunlap) - dvb_register_i2c_device() locking fix for -ENOMEM (akpm) - dvb_register_i2c_bus() locking fix for -ENOMEM (akpm) --- linux/include/linux/dvb/osd.h | 2 +- linux/include/linux/dvb/video.h | 2 +- linux/include/media/saa7146_vv.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/include') diff --git a/linux/include/linux/dvb/osd.h b/linux/include/linux/dvb/osd.h index d12d7e83e..bd7559c76 100644 --- a/linux/include/linux/dvb/osd.h +++ b/linux/include/linux/dvb/osd.h @@ -102,7 +102,7 @@ typedef struct osd_cmd_s { int x1; int y1; int color; - void *data; + void __user *data; } osd_cmd_t; /* OSD_OpenRaw: set 'color' to desired window type */ diff --git a/linux/include/linux/dvb/video.h b/linux/include/linux/dvb/video.h index c7d456813..9782fd29a 100644 --- a/linux/include/linux/dvb/video.h +++ b/linux/include/linux/dvb/video.h @@ -100,7 +100,7 @@ struct video_status { struct video_still_picture { - char *iFrame; /* pointer to a single iframe in memory */ + char __user *iFrame; /* pointer to a single iframe in memory */ int32_t size; }; diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h index c77eb8915..58fa58b4c 100644 --- a/linux/include/media/saa7146_vv.h +++ b/linux/include/media/saa7146_vv.h @@ -185,7 +185,7 @@ struct saa7146_use_ops { int(*open)(struct saa7146_dev *, struct file *); void (*release)(struct saa7146_dev *, struct file *); void (*irq_done)(struct saa7146_dev *, unsigned long status); - ssize_t (*read)(struct file *, char *, size_t, loff_t *); + ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); }; /* from saa7146_fops.c */ -- cgit v1.2.3