2 files changed, 2 insertions, 0 deletions

diff --git a/sound/hda/hdac_bus.c b/sound/hda/hdac_bus.c
index 0e81ea89a596..714a51721a31 100644
--- a/sound/hda/hdac_bus.c
+++ b/sound/hda/hdac_bus.c
@@ -212,5 +212,6 @@ void snd_hdac_bus_remove_device(struct hdac_bus *bus,
         bus->caddr_tbl[codec->addr] = NULL;
         clear_bit(codec->addr, &bus->codec_powered);
         bus->num_codecs--;
+        flush_work(&bus->unsol_work);
 }
 EXPORT_SYMBOL_GPL(snd_hdac_bus_remove_device);
diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c
index 03c9872c31cf..19deb306facb 100644
--- a/sound/hda/hdac_device.c
+++ b/sound/hda/hdac_device.c
@@ -159,6 +159,7 @@ void snd_hdac_device_unregister(struct hdac_device *codec)
         if (device_is_registered(&codec->dev)) {
                 hda_widget_sysfs_exit(codec);
                 device_del(&codec->dev);
+                snd_hdac_bus_remove_device(codec->bus, codec);
         }
 }
 EXPORT_SYMBOL_GPL(snd_hdac_device_unregister);