summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai2011-05-02 13:58:23 +0200
committerTakashi Iwai2011-05-02 13:58:23 +0200
commit20ec8b24636e2d43435a27a55dbb7e8331c563ca (patch)
tree587de6c0d4f84b0420f33f2e590113107ebf4336 /sound
parentALSA: hda - Constify fixup and other array data in patch_via.c (diff)
parentALSA: hda - Fix Realtek's chained fixup checks (diff)
downloadkernel-qcow2-linux-20ec8b24636e2d43435a27a55dbb7e8331c563ca.tar.gz
kernel-qcow2-linux-20ec8b24636e2d43435a27a55dbb7e8331c563ca.tar.xz
kernel-qcow2-linux-20ec8b24636e2d43435a27a55dbb7e8331c563ca.zip
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0f2b52aeb400..c9f77152e079 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1948,11 +1948,11 @@ static void alc_apply_fixup(struct hda_codec *codec, int action)
codec->chip_name, fix->type);
break;
}
- if (!fix[id].chained)
+ if (!fix->chained)
break;
if (++depth > 10)
break;
- id = fix[id].chain_id;
+ id = fix->chain_id;
}
}