diff options
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c index 79334980c..fcad346e3 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c @@ -48,25 +48,24 @@ struct pvr2_v4l_wm8775 { static void set_input(struct pvr2_v4l_wm8775 *ctxt) { - struct v4l2_audio inp; + struct v4l2_routing route; struct pvr2_hdw *hdw = ctxt->hdw; int msk = 0; - memset(&inp,0,sizeof(inp)); + memset(&route,0,sizeof(route)); pvr2_trace(PVR2_TRACE_CHIPS,"i2c wm8775 set_input(val=%d msk=0x%x)", - hdw->controls[PVR2_CID_INPUT].value,msk); + hdw->input_val,msk); // Always point to input #1 no matter what - inp.index = 2; - pvr2_i2c_client_cmd(ctxt->client,VIDIOC_S_AUDIO,&inp); + route.input = 2; + pvr2_i2c_client_cmd(ctxt->client,VIDIOC_INT_S_AUDIO_ROUTING,&route); } - static int check_input(struct pvr2_v4l_wm8775 *ctxt) { struct pvr2_hdw *hdw = ctxt->hdw; - return hdw->controls[PVR2_CID_INPUT].dirty != 0; + return hdw->input_dirty != 0; } |