1 files changed, 6 insertions, 2 deletions

diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 3715a5725613..1c60beb5b70a 100644
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -1337,8 +1337,12 @@ EXPORT_SYMBOL_GPL(azx_probe_codecs);
 /* configure each codec instance */
 int azx_codec_configure(struct azx *chip)
 {
-        struct hda_codec *codec;
-        list_for_each_codec(codec, &chip->bus) {
+        struct hda_codec *codec, *next;
+
+        /* use _safe version here since snd_hda_codec_configure() deregisters
+         * the device upon error and deletes itself from the bus list.
+         */
+        list_for_each_codec_safe(codec, next, &chip->bus) {
                 snd_hda_codec_configure(codec);
         }
         return 0;