diff options
| author | Michael Hunold <devnull@localhost> | 2003-10-09 10:06:10 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-10-09 10:06:10 +0000 |
| commit | 42dd92758db3261aba3da6f42db85857b459335c (patch) | |
| tree | ae8a70a2d3bb32574c62da47f967e50f78c7863b /linux/drivers/media/common | |
| parent | 9347dffcaf23cf01055c0d6020787336aa546bef (diff) | |
| download | mediapointer-dvb-s2-42dd92758db3261aba3da6f42db85857b459335c.tar.gz mediapointer-dvb-s2-42dd92758db3261aba3da6f42db85857b459335c.tar.bz2 | |
- backfeed patches from 2.6.0-test7, which have not gone through our cvs:
- janitorial fixes (mostly return code handling)
- spelling fixes in Kconfig files
- line breaks to re-formatting
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index 067a27c82..d5f02eca5 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -163,7 +163,7 @@ void saa7146_buffer_timeout(unsigned long data) static int fops_open(struct inode *inode, struct file *file) { - unsigned int minor = minor(inode->i_rdev); + unsigned int minor = iminor(inode); struct saa7146_dev *h = NULL, *dev = NULL; struct list_head *list; struct saa7146_fh *fh = NULL; diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 096310670..7b04748c0 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1219,7 +1219,8 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int q = &fh->video_q; down(&q->lock); - err = videobuf_mmap_setup(file,q,gbuffers,gbufsize, V4L2_MEMORY_MMAP); + err = videobuf_mmap_setup(file,q,gbuffers,gbufsize, + V4L2_MEMORY_MMAP); if (err < 0) { up(&q->lock); return err; |