[alsa-devel] [PATCH] ALSA: asihpi - fix potential NULL pointer dereference

[Takashi Iwai]

At Tue, 12 Mar 2013 00:16:40 +0800,
Wei Yongjun wrote:
> 
> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> 
> The dereference should be moved below the NULL test.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei at trendmicro.com.cn>

Applied now.  Thanks.


Takashi

> ---
>  sound/pci/asihpi/asihpi.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
> index 3536b07..0aabfed 100644
> --- a/sound/pci/asihpi/asihpi.c
> +++ b/sound/pci/asihpi/asihpi.c
> @@ -2549,7 +2549,7 @@ static int snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi,
>  
>  static int snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
>  {
> -	struct snd_card *card = asihpi->card;
> +	struct snd_card *card;
>  	unsigned int idx = 0;
>  	unsigned int subindex = 0;
>  	int err;
> @@ -2557,6 +2557,7 @@ static int snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
>  
>  	if (snd_BUG_ON(!asihpi))
>  		return -EINVAL;
> +	card = asihpi->card;
>  	strcpy(card->mixername, "Asihpi Mixer");
>  
>  	err =
> 
>