Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sound-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Two last-minute HD-audio fixes"
* tag 'sound-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix endless loop of codec configure
ALSA: hda - set input_path bitmap to zero after moving it to new place
+9
-2
+2
sound/pci/hda/hda_codec.h
+2
sound/pci/hda/hda_codec.h
···
295
295
296
296
#define list_for_each_codec(c, bus) \
297
297
list_for_each_entry(c, &(bus)->core.codec_list, core.list)
298
+
#define list_for_each_codec_safe(c, n, bus) \
299
+
list_for_each_entry_safe(c, n, &(bus)->core.codec_list, core.list)
298
300
299
301
/* snd_hda_codec_read/write optional flags */
300
302
#define HDA_RW_NO_RESPONSE_FALLBACK (1 << 0)
+6
-2
sound/pci/hda/hda_controller.c
+6
-2
sound/pci/hda/hda_controller.c
···
1337
1337
/* configure each codec instance */
1338
1338
int azx_codec_configure(struct azx *chip)
1339
1339
{
1340
-
struct hda_codec *codec;
1341
-
list_for_each_codec(codec, &chip->bus) {
1340
+
struct hda_codec *codec, *next;
1341
+
1342
+
/* use _safe version here since snd_hda_codec_configure() deregisters
1343
+
* the device upon error and deletes itself from the bus list.
1344
+
*/
1345
+
list_for_each_codec_safe(codec, next, &chip->bus) {
1342
1346
snd_hda_codec_configure(codec);
1343
1347
}
1344
1348
return 0;