From da9fe7c274be355bbf11a229f4c83853d0b77e31 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 9 Jan 2006 15:25:41 -0200 Subject: [PATCH] --- yaml --- r: 17339 b: refs/heads/master c: 21fa715e67fe57e404d7f5f39b7f18016db9e4b6 h: refs/heads/master i: 17337: 3f1d6f555a0cec10bee696ee9fce901934cd58fc 17335: 13c2610730eeb1849a519160da5491810e5eb674 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7115.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index beadf3f62ef2..fcbfee9f508e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbc46e74fa437f16a3ffe4a5561a97f41680a124 +refs/heads/master: 21fa715e67fe57e404d7f5f39b7f18016db9e4b6 diff --git a/trunk/drivers/media/video/saa7115.c b/trunk/drivers/media/video/saa7115.c index 685ca1780c66..b175389d9f43 100644 --- a/trunk/drivers/media/video/saa7115.c +++ b/trunk/drivers/media/video/saa7115.c @@ -801,6 +801,11 @@ static void saa7115_log_status(struct i2c_client *client) signalOk = (reg1f & 0xc1) == 0x81 && (reg1e & 0xc0) == 0x80; vcr = !(reg1f & 0x10); + if (state->input >= 6) { + saa7115_info("Input: S-Video %d\n", state->input - 6); + } else { + saa7115_info("Input: Composite %d\n", state->input); + } saa7115_info("Video signal: %s\n", signalOk ? (vcr ? "VCR" : "broadcast/DVD") : "bad"); saa7115_info("Frequency: %s\n", (reg1f & 0x20) ? "60Hz" : "50Hz");