From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 24 Jun 2021 08:02:45 +0000 (+0200)
Subject: Merge tag 'asoc-fix-v5.13-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6918^2~9^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'asoc-fix-v5.13-rc7' of https://git./linux/kernel/git/broonie/sound into for-next

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.
---

5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28
diff --cc sound/isa/sb/sb8.c
index de68ac5,ed3a87e..b08e6e7
--- a/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 */