diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-07-31 00:05:45 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-07-31 00:05:45 +0000 |
| commit | d3c7341869a8188aff16975a785c4c5d05c3fcb8 (patch) | |
| tree | d0fa6a77187580a4ff427ed50608a2490f245cda /linux/drivers/media/common/saa7146_video.c | |
| parent | 12994bfc905a0bb9f5ba354f7d11278d39dbc26b (diff) | |
| download | mediapointer-dvb-s2-d3c7341869a8188aff16975a785c4c5d05c3fcb8.tar.gz mediapointer-dvb-s2-d3c7341869a8188aff16975a785c4c5d05c3fcb8.tar.bz2 | |
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)
Diffstat (limited to 'linux/drivers/media/common/saa7146_video.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index daec274e5..05632374b 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1457,7 +1457,7 @@ static void video_irq_done(struct saa7146_dev *dev, unsigned long st) spin_unlock(&dev->slock); } -static ssize_t video_read(struct file *file, char *data, size_t count, loff_t *ppos) +static ssize_t video_read(struct file *file, char __user *data, size_t count, loff_t *ppos) { struct saa7146_fh *fh = file->private_data; struct saa7146_dev *dev = fh->dev; |