commit 3faeeae48348959c58f3121d2a6a4fb0bc626da0
author Hans Verkuil <hverkuil@xs4all.nl> Mon Jan 09 15:25:44 2006 -0200
committer Mauro Carvalho Chehab <mchehab@brturbo.com.br> Mon Jan 09 15:25:44 2006 -0200
tree b8a9388826d06542c190d7ce7c3fe44b78e22b30
parent d3900bc42e6bc5e461c29951cc2a50df09e08771

V4L/DVB (3256): When in radio mode ignore VIDIOC_G_TUNER


- Detect when AUDC_SET_RADIO is called.
- When in radio mode ignore VIDIOC_G_TUNER.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

drivers/media/video/saa7115.c

diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 5d33d09..9f550fd 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -74,6 +74,7 @@
 	v4l2_std_id std;
 	int input;
 	int enable;
+	int radio;
 	int bright;
 	int contrast;
 	int hue;
@@ -634,6 +635,9 @@
 		state->hue = ctrl->value;
 		saa7115_write(client, 0x0d, state->hue);
 		break;
+
+	default:
+		return -EINVAL;
 	}
 
 	return 0;
@@ -1043,6 +1047,8 @@
 		struct v4l2_tuner *vt = arg;
 		int status;
 
+		if (state->radio)
+			break;
 		status = saa7115_read(client, 0x1f);
 
 		saa7115_dbg("status: 0x%02x\n", status);
@@ -1065,9 +1071,14 @@
 		break;
 
 	case VIDIOC_S_STD:
+		state->radio = 0;
 		saa7115_set_v4lstd(client, *(v4l2_std_id *)arg);
 		break;
 
+	case AUDC_SET_RADIO:
+		state->radio = 1;
+		break;
+
 	case VIDIOC_G_INPUT:
 		*(int *)arg = state->input;
 		break;
@@ -1230,6 +1241,7 @@
 	state->std = V4L2_STD_NTSC;
 	state->input = -1;
 	state->enable = 1;
+	state->radio = 0;
 	state->bright = 128;
 	state->contrast = 64;
 	state->hue = 0;