diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-04-13 10:09:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-04-13 10:09:46 +0200 |
| commit | 99fff44fe339b21c6a4ddd6c1239e587dd439cd3 (patch) | |
| tree | 132e59f06c467786f21b9b67a5a031936850b384 /sound/hda/hdac_bus.c | |
| parent | 6b580f523172f2c738b661069a57c23c74a75f88 (diff) | |
| parent | 183ab39eb0ea9879bb68422a83e65f750f3192f0 (diff) | |
| download | linux-99fff44fe339b21c6a4ddd6c1239e587dd439cd3.tar.gz linux-99fff44fe339b21c6a4ddd6c1239e587dd439cd3.tar.bz2 linux-99fff44fe339b21c6a4ddd6c1239e587dd439cd3.zip | |
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/hdac_bus.c')
| -rw-r--r-- | sound/hda/hdac_bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/hda/hdac_bus.c b/sound/hda/hdac_bus.c index 012305177f68..ad8eee08013f 100644 --- a/sound/hda/hdac_bus.c +++ b/sound/hda/hdac_bus.c @@ -38,6 +38,7 @@ int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev, INIT_WORK(&bus->unsol_work, snd_hdac_bus_process_unsol_events); spin_lock_init(&bus->reg_lock); mutex_init(&bus->cmd_mutex); + mutex_init(&bus->lock); bus->irq = -1; return 0; } |