diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-02 13:23:55 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-02 13:23:55 -0200 |
| commit | 917f6e47b08ad85db5b84c708fe5049c30afc643 (patch) | |
| tree | 0933317050f3403b4aa9483edfe9b9e7f791f47f /linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |
| parent | 066a48c964e17e01684f52a4671affacda22cf88 (diff) | |
| parent | fa3c54d7157ced7633dabdf681c21f139976f384 (diff) | |
| download | mediapointer-dvb-s2-917f6e47b08ad85db5b84c708fe5049c30afc643.tar.gz mediapointer-dvb-s2-917f6e47b08ad85db5b84c708fe5049c30afc643.tar.bz2 | |
Merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index e692ad5f7..165c00f44 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c @@ -367,8 +367,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, { struct v4l2_tuner *vt = (struct v4l2_tuner *)arg; - if (vt->index != 0) - break; + if (vt->index != 0) break; /* Only answer for the 1st tuner */ pvr2_hdw_execute_tuner_poll(hdw); ret = pvr2_hdw_get_tuner_status(hdw,vt); @@ -740,10 +739,6 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, } #ifdef CONFIG_VIDEO_ADV_DEBUG case VIDIOC_DBG_S_REGISTER: - if (!capable(CAP_SYS_ADMIN)) { - ret = -EPERM; - break; - } /* fall through */ case VIDIOC_DBG_G_REGISTER: { u32 val; |