aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sb/sb8.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-06-24 10:02:45 +0200
committerTakashi Iwai <tiwai@suse.de>2021-06-24 10:02:45 +0200
commit5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28 (patch)
tree75d09ba90c72e75b3d488edd2c37c96c3f268952 /sound/isa/sb/sb8.c
parentALSA: hda: Release codec display power during shutdown/reboot (diff)
parentASoC: atmel-i2s: Fix usage of capture and playback at the same time (diff)
downloadlinux-dev-5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28.tar.xz
linux-dev-5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28.zip
Merge tag 'asoc-fix-v5.13-rc7' of https://git.kernel.org/pub/scm/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.
Diffstat (limited to 'sound/isa/sb/sb8.c')
-rw-r--r--sound/isa/sb/sb8.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index de68ac5df35b..b08e6e7690c9 100644
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -93,12 +93,12 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev)
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) {
err = snd_sbdsp_create(card, port[dev], irq[dev],