diff options
author | Scott Wood <scottwood@freescale.com> | 2015-04-15 19:16:47 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-16 04:15:44 -0400 |
commit | 3047755588e71b67c3f60409686fabf8506357e9 (patch) | |
tree | daa93c98a2058cee2277c6bff44b5f8b8343c32e | |
parent | 828fa8ce5a8d75169f16740c28c8a1b7c13dd96b (diff) |
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>
-rw-r--r-- | sound/pci/intel8x0.c | 4 |
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, | |||
3101 | chip->bmaddr = pci_iomap(pci, 3, 0); | 3101 | chip->bmaddr = pci_iomap(pci, 3, 0); |
3102 | else | 3102 | else |
3103 | chip->bmaddr = pci_iomap(pci, 1, 0); | 3103 | chip->bmaddr = pci_iomap(pci, 1, 0); |
3104 | |||
3105 | port_inited: | ||
3104 | if (!chip->bmaddr) { | 3106 | if (!chip->bmaddr) { |
3105 | dev_err(card->dev, "Controller space ioremap problem\n"); | 3107 | dev_err(card->dev, "Controller space ioremap problem\n"); |
3106 | snd_intel8x0_free(chip); | 3108 | snd_intel8x0_free(chip); |
3107 | return -EIO; | 3109 | return -EIO; |
3108 | } | 3110 | } |
3109 | |||
3110 | port_inited: | ||
3111 | chip->bdbars_count = bdbars[device_type]; | 3111 | chip->bdbars_count = bdbars[device_type]; |
3112 | 3112 | ||
3113 | /* initialize offsets */ | 3113 | /* initialize offsets */ |