From: Scott Wood <scottwood@freescale.com>
Date: Wed, 15 Apr 2015 23:16:47 +0000 (-0500)
Subject: ALSA: intel8x0: Check pci_iomap() success for DEVICE_ALI
X-Git-Tag: v4.14-rc1~5480^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3047755588e71b67c3f60409686fabf8506357e9;p=platform%2Fkernel%2Flinux-rpi.git

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

diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 749069a..b120925 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 */