summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-08 09:31:36 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-05-08 09:31:36 -0300
commit28f6c9a62e06fb08a4f1e205ff286ddab6bc9d98 (patch)
treebad1b33b790a4373aa122891d02a62370f4bd85d /linux/drivers
parent2f3950ef850d0983cce8573e8fc7f194d7008137 (diff)
downloadmediapointer-dvb-s2-28f6c9a62e06fb08a4f1e205ff286ddab6bc9d98.tar.gz
mediapointer-dvb-s2-28f6c9a62e06fb08a4f1e205ff286ddab6bc9d98.tar.bz2
Fix mistake in patch 5571
From: Trent Piepho <xyzzy@speakeasy.org> Two lines from an older version snuck in. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/v4l1-compat.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c
index 253771b0b..c52df6cae 100644
--- a/linux/drivers/media/video/v4l1-compat.c
+++ b/linux/drivers/media/video/v4l1-compat.c
@@ -684,8 +684,6 @@ v4l_compat_translate_ioctl(struct inode *inode,
if (ovl_err < 0)
dprintk("VIDIOCSPICT / VIDIOC_S_FBUF: %d\n",
ovl_err);
- if (ovl_err == -EPERM)
- ovl_err = 0;
}
if (ovl_err < 0 && mem_err < 0)
/* ioctl failed, couldn't set either parameter */