diff --git a/[refs] b/[refs] index 6a3c9fb2626f..4df014af0cb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4533332c0c60335f117ffc65cc4a067314bb441 +refs/heads/master: fe023ad15e4a9147c208e4c4cac98d7fd40ab0bd diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-control.c b/trunk/drivers/media/video/hdpvr/hdpvr-control.c index b5cd2b50f748..068df4ba3f51 100644 --- a/trunk/drivers/media/video/hdpvr/hdpvr-control.c +++ b/trunk/drivers/media/video/hdpvr/hdpvr-control.c @@ -168,8 +168,7 @@ int hdpvr_set_audio(struct hdpvr_device *dev, u8 input, if (ret == 2) ret = 0; } else - ret = hdpvr_config_call(dev, CTRL_AUDIO_INPUT_VALUE, - dev->options.audio_input+1); + ret = hdpvr_config_call(dev, CTRL_AUDIO_INPUT_VALUE, input); error: return ret; }