summaryrefslogtreecommitdiff
path: root/sound/hda/hdac_controller.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-05-02 08:24:42 +0200
committerTakashi Iwai <tiwai@suse.de>2017-05-02 08:24:42 +0200
commitd7dc450d5a7162de96edbed6b1792240c2f3a55f (patch)
treed6dc2d26b393dd69881cd4b9498718f65b35abeb /sound/hda/hdac_controller.c
parentd4a2fbcee0c8449ce24d6de168f3d90c5e6d7596 (diff)
parent0997e378be1d888a5d093eeee55f842cdfe55ebe (diff)
Merge branch 'for-next' into for-linus
For 4.12 merge.
Diffstat (limited to 'sound/hda/hdac_controller.c')
-rw-r--r--sound/hda/hdac_controller.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c
index 043065867656..d15b653de0bf 100644
--- a/sound/hda/hdac_controller.c
+++ b/sound/hda/hdac_controller.c
@@ -272,7 +272,7 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus)
/* Lets walk the linked capabilities list */
do {
- cur_cap = _snd_hdac_chip_read(l, bus, offset);
+ cur_cap = _snd_hdac_chip_readl(bus, offset);
dev_dbg(bus->dev, "Capability version: 0x%x\n",
(cur_cap & AZX_CAP_HDR_VER_MASK) >> AZX_CAP_HDR_VER_OFF);