diff options
| author | Mark Brown <broonie@kernel.org> | 2017-03-29 13:50:26 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-29 13:50:26 +0200 |
| commit | 240a07dbc30db6e728625e4e0eb736bbeefed6e6 (patch) | |
| tree | 917e15fc7fcc3f58d8fff0bf63fbcb6786a05669 /sound/hda | |
| parent | ASoC: intel: remove unused variable data and associated code (diff) | |
| parent | ALSA: hda: Fix LLCH register read (diff) | |
| download | linux-240a07dbc30db6e728625e4e0eb736bbeefed6e6.tar.xz linux-240a07dbc30db6e728625e4e0eb736bbeefed6e6.zip | |
Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/hdac_controller.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c index 043065867656..6f1e99c9fed9 100644 --- a/sound/hda/hdac_controller.c +++ b/sound/hda/hdac_controller.c @@ -268,7 +268,7 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus) unsigned int offset; unsigned int counter = 0; - offset = snd_hdac_chip_readl(bus, LLCH); + offset = snd_hdac_chip_readw(bus, LLCH); /* Lets walk the linked capabilities list */ do { |