]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ALSA: lx6464es: add error handling for pci_ioremap_bar
authorZhouyang Jia <jiazhouyang09@gmail.com>
Thu, 14 Jun 2018 13:51:46 +0000 (21:51 +0800)
committerTakashi Iwai <tiwai@suse.de>
Thu, 14 Jun 2018 16:01:06 +0000 (18:01 +0200)
When pci_ioremap_bar fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling pci_ioremap_bar.

Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/lx6464es/lx6464es.c

index 9655b08a1c52f194c7b627ba32732dab604f5929..6c85f13ab23f17f7ef4031f5f73797fb383584a7 100644 (file)
@@ -1016,6 +1016,10 @@ static int snd_lx6464es_create(struct snd_card *card,
 
        /* dsp port */
        chip->port_dsp_bar = pci_ioremap_bar(pci, 2);
+       if (!chip->port_dsp_bar) {
+               dev_err(card->dev, "cannot remap PCI memory region\n");
+               goto remap_pci_failed;
+       }
 
        err = request_threaded_irq(pci->irq, lx_interrupt, lx_threaded_irq,
                                   IRQF_SHARED, KBUILD_MODNAME, chip);
@@ -1055,6 +1059,9 @@ device_new_failed:
        free_irq(pci->irq, chip);
 
 request_irq_failed:
+       iounmap(chip->port_dsp_bar);
+
+remap_pci_failed:
        pci_release_regions(pci);
 
 request_regions_failed: