summaryrefslogtreecommitdiffstats
path: root/sound/hda/ext
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-04-13 10:09:40 +0200
committerTakashi Iwai <tiwai@suse.de>2019-04-13 10:09:46 +0200
commit99fff44fe339b21c6a4ddd6c1239e587dd439cd3 (patch)
tree132e59f06c467786f21b9b67a5a031936850b384 /sound/hda/ext
parent6b580f523172f2c738b661069a57c23c74a75f88 (diff)
parent183ab39eb0ea9879bb68422a83e65f750f3192f0 (diff)
downloadlinux-99fff44fe339b21c6a4ddd6c1239e587dd439cd3.tar.bz2
Merge branch 'for-linus' into for-next
Back-merge the 5.1 devel branch for the further HD-audio development. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda/ext')
-rw-r--r--sound/hda/ext/hdac_ext_bus.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/hda/ext/hdac_ext_bus.c b/sound/hda/ext/hdac_ext_bus.c
index 9c37d9af3023..ec7715c6b0c0 100644
--- a/sound/hda/ext/hdac_ext_bus.c
+++ b/sound/hda/ext/hdac_ext_bus.c
@@ -107,7 +107,6 @@ int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,
INIT_LIST_HEAD(&bus->hlink_list);
bus->idx = idx++;
- mutex_init(&bus->lock);
bus->cmd_dma_state = true;
return 0;