[alsa-devel] [PATCH] ALSA: azt3328 - Fix NULL ptr dereference on cards without OPL3

[Takashi Iwai]

At Sat, 25 Feb 2012 16:15:57 +0100,
Alban Bedel wrote:
> 
> opl3->private_data was set even if opl3 could not be created.
> 
> Signed-off-by: Alban Bedel <albeu at free.fr>

Thanks, applied now.


Takashi

> ---
>  sound/pci/azt3328.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
> index 95ffa6a..496f14c 100644
> --- a/sound/pci/azt3328.c
> +++ b/sound/pci/azt3328.c
> @@ -2684,10 +2684,9 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
>  		err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
>  		if (err < 0)
>  			goto out_err;
> +		opl3->private_data = chip;
>  	}
>  
> -	opl3->private_data = chip;
> -
>  	sprintf(card->longname, "%s at 0x%lx, irq %i",
>  		card->shortname, chip->ctrl_io, chip->irq);
>  
> -- 
> 1.7.1
>