diff options
author | Mike Isely <isely@pobox.com> | 2007-01-19 23:56:04 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:41 -0500 |
commit | 606cf9caeb3b908426757924bfdce85cb854aa81 (patch) | |
tree | f7236b01b9d8e3af4b12116a9c0ebe055f1ac60c /drivers/media/video/pvrusb2/pvrusb2-audio.c | |
parent | 27c7b710a4010e10b14500c0b27bb4c2a806de1b (diff) |
V4L/DVB (5093): Pvrusb2: Emit VIDIOC_S_TUNER correctly
Audio mode changes are not private to the audio chip - other I2C
modules need to see this as well. And since the command in question
is VIDIOC_S_TUNER which is a standard v4l2 command, we really should
be broadcasting it out. This change sets up a broadcast pathway for
VIDIOC_S_TUNER and also eliminates the now redundant code from the
audio chip handler.
This fix enables stereo reception for the FM radio
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-audio.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-audio.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c index a45ede0a8cf1..379645e481c6 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c | |||
@@ -43,13 +43,6 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt) | |||
43 | 43 | ||
44 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 v4l2 set_stereo"); | 44 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c msp3400 v4l2 set_stereo"); |
45 | 45 | ||
46 | if (hdw->input_val == PVR2_CVAL_INPUT_TV) { | ||
47 | struct v4l2_tuner vt; | ||
48 | memset(&vt,0,sizeof(vt)); | ||
49 | vt.audmode = hdw->audiomode_val; | ||
50 | pvr2_i2c_client_cmd(ctxt->client,VIDIOC_S_TUNER,&vt); | ||
51 | } | ||
52 | |||
53 | route.input = MSP_INPUT_DEFAULT; | 46 | route.input = MSP_INPUT_DEFAULT; |
54 | route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1); | 47 | route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1); |
55 | switch (hdw->input_val) { | 48 | switch (hdw->input_val) { |
@@ -77,8 +70,7 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt) | |||
77 | static int check_stereo(struct pvr2_msp3400_handler *ctxt) | 70 | static int check_stereo(struct pvr2_msp3400_handler *ctxt) |
78 | { | 71 | { |
79 | struct pvr2_hdw *hdw = ctxt->hdw; | 72 | struct pvr2_hdw *hdw = ctxt->hdw; |
80 | return (hdw->input_dirty || | 73 | return hdw->input_dirty; |
81 | hdw->audiomode_dirty); | ||
82 | } | 74 | } |
83 | 75 | ||
84 | 76 | ||