[alsa-devel] [PATCH] ALSA: intel8x0: Check pci_iomap() success for DEVICE_ALI

Takashi Iwai tiwai at suse.de
Thu Apr 16 10:15:52 CEST 2015


At Wed, 15 Apr 2015 18:16:47 -0500,
Scott Wood wrote:
> 
> 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 at freescale.com>

Applied, thanks.


Takashi

> ---
>  sound/pci/intel8x0.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
> index 2c5484e..dfb77a5 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 */
> -- 
> 2.1.0
> 


More information about the Alsa-devel mailing list