aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7115.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7115.c')
-rw-r--r--drivers/media/video/saa7115.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index edea9e3d2dca..f4843bb45347 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1238,34 +1238,6 @@ static int saa7115_command(struct i2c_client *client, unsigned int cmd, void *ar
1238 break; 1238 break;
1239 } 1239 }
1240 1240
1241 case VIDIOC_G_INPUT:
1242 *(int *)arg = state->input;
1243 break;
1244
1245 case VIDIOC_S_INPUT:
1246 v4l_dbg(1, debug, client, "decoder set input %d\n", *iarg);
1247 /* inputs from 0-9 are available */
1248 if (*iarg < 0 || *iarg > 9) {
1249 return -EINVAL;
1250 }
1251
1252 if (state->input == *iarg)
1253 break;
1254 v4l_dbg(1, debug, client, "now setting %s input\n",
1255 *iarg >= 6 ? "S-Video" : "Composite");
1256 state->input = *iarg;
1257
1258 /* select mode */
1259 saa7115_write(client, 0x02,
1260 (saa7115_read(client, 0x02) & 0xf0) |
1261 state->input);
1262
1263 /* bypass chrominance trap for modes 6..9 */
1264 saa7115_write(client, 0x09,
1265 (saa7115_read(client, 0x09) & 0x7f) |
1266 (state->input < 6 ? 0x0 : 0x80));
1267 break;
1268
1269 case VIDIOC_STREAMON: 1241 case VIDIOC_STREAMON:
1270 case VIDIOC_STREAMOFF: 1242 case VIDIOC_STREAMOFF:
1271 v4l_dbg(1, debug, client, "%s output\n", 1243 v4l_dbg(1, debug, client, "%s output\n",