summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-04-15 18:16:47 -0500
committerTakashi Iwai <tiwai@suse.de>2015-04-16 10:15:44 +0200
commit3047755588e71b67c3f60409686fabf8506357e9 (patch)
treedaa93c98a2058cee2277c6bff44b5f8b8343c32e /sound
parent828fa8ce5a8d75169f16740c28c8a1b7c13dd96b (diff)
downloadlinux-stable-3047755588e71b67c3f60409686fabf8506357e9.tar.gz
linux-stable-3047755588e71b67c3f60409686fabf8506357e9.tar.bz2
linux-stable-3047755588e71b67c3f60409686fabf8506357e9.zip
ALSA: intel8x0: Check pci_iomap() success for DEVICE_ALI
DEVICE_ALI previously would jump to port_inited after calling pci_iomap(), bypassing the check for bmaddr being NULL. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/intel8x0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 749069aa6997..b120925223ae 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -3101,13 +3101,13 @@ static int snd_intel8x0_create(struct snd_card *card,
chip->bmaddr = pci_iomap(pci, 3, 0);
else
chip->bmaddr = pci_iomap(pci, 1, 0);
+
+ port_inited:
if (!chip->bmaddr) {
dev_err(card->dev, "Controller space ioremap problem\n");
snd_intel8x0_free(chip);
return -EIO;
}
-
- port_inited:
chip->bdbars_count = bdbars[device_type];
/* initialize offsets */