summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-12-02 15:29:12 +0100
committerTakashi Iwai <tiwai@suse.de>2011-12-02 15:29:12 +0100
commitcce4aa378a049f4275416ee6302dd24f37b289df (patch)
treeb686554cfc7417299b37152d746f8670ee204551 /sound/pci
parentfc084e0b930d546872ab23667052499f7daf0fed (diff)
downloadop-kernel-dev-cce4aa378a049f4275416ee6302dd24f37b289df.zip
op-kernel-dev-cce4aa378a049f4275416ee6302dd24f37b289df.tar.gz
ALSA: hda/realtek - Fix Oops in alc_mux_select()
When no imux is available (e.g. a single capture source), alc_auto_init_input_src() may trigger an Oops due to the access to -1. Add a proper zero-check to avoid it. Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index cbde019..a7d1bc4 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -297,6 +297,8 @@ static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx,
imux = &spec->input_mux[mux_idx];
if (!imux->num_items && mux_idx > 0)
imux = &spec->input_mux[0];
+ if (!imux->num_items)
+ return 0;
if (idx >= imux->num_items)
idx = imux->num_items - 1;
OpenPOWER on IntegriCloud