Merge tag 'asoc-fix-v5.13-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git...

ASoC: Fixes for v5.13

A final batch of fixes for v5.13, this is larger than I'd like due to
the fixes for a series of suspend issues that Intel turned up in their
testing this week.

diff --cc MAINTAINERS
Simple merge

diff --cc sound/isa/gus/gus_main.c
Simple merge

diff --cc sound/isa/sb/sb16_main.c
Simple merge

diff --cc sound/isa/sb/sb8.c
index de68ac5df35bd302f56d287fb5b02fad8dd3b2a3,ed3a87ebe3f4119cc0698dc3852471891826c03a..b08e6e7690c9b8aad311fb6c5f670cda0df2aa92
--- 1/sound/isa/sb/sb8.c
--- 2/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@@ -93,18 -93,20 +93,18 @@@ static int snd_sb8_probe(struct device 
        acard = card->private_data;
        card->private_free = snd_sb8_free;
  
-       /* block the 0x388 port to avoid PnP conflicts */
+       /*
+        * Block the 0x388 port to avoid PnP conflicts.
+        * No need to check this value after request_region,
+        * as we never do anything with it.
+        */
        acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
-       if (!acard->fm_res) {
-               err = -EBUSY;
-               goto _err;
-       }
  
        if (port[dev] != SNDRV_AUTO_PORT) {
 -              if ((err = snd_sbdsp_create(card, port[dev], irq[dev],
 -                                          snd_sb8_interrupt,
 -                                          dma8[dev],
 -                                          -1,
 -                                          SB_HW_AUTO,
 -                                          &chip)) < 0)
 +              err = snd_sbdsp_create(card, port[dev], irq[dev],
 +                                     snd_sb8_interrupt, dma8[dev],
 +                                     -1, SB_HW_AUTO, &chip);
 +              if (err < 0)
                        goto _err;
        } else {
                /* auto-probe legacy ports */

diff --cc sound/soc/soc-core.c
Simple merge