From b9e436cd9bd1d50e318caa62aa4df669eee96d22 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 12 Jul 2010 15:42:34 -0300 Subject: [PATCH] --- yaml --- r: 219259 b: refs/heads/master c: 66d7c4318a5933099b3c57a8551b32f9f35eb741 h: refs/heads/master i: 219257: e8840702dc16898eaa0afd934f45d048e03c3c4e 219255: 210855ee7005afdf57265c5f27151394d5e44550 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx231xx/cx231xx-video.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index f10372eb3959..ef81ad9b077d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b88ba6193d5f2469b2b29b52e8cca78a4caa47e0 +refs/heads/master: 66d7c4318a5933099b3c57a8551b32f9f35eb741 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-video.c b/trunk/drivers/media/video/cx231xx/cx231xx-video.c index 06f492e7891d..31097e403406 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-video.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-video.c @@ -1232,18 +1232,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) struct cx231xx *dev = fh->dev; int rc; - if (i == 10) { - dev->USE_ISO = 0; - cx231xx_info("trans-mode=BULK. USE_ISO = %d\n", dev->USE_ISO); - return 0; - } - - if (i == 11) { - dev->USE_ISO = 1; - cx231xx_info("trans-mode=ISOC. USE_ISO = %d\n", dev->USE_ISO); - return 0; - } - dev->mode_tv = 0; rc = check_dev(dev); if (rc < 0)