Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 631e8ad4 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

ALSA: aaci - Fix NULL test at error path 



The original fix by Julien Brunel <brunel@diku.dk>.

aaci_init_card() returns a pointer with ERR_PTR(), but in aaci_init()
NULL is supposed at this error path.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent d695e4ea

sound/arm/aaci.c

+3 −3
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev) 
	card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			    THIS_MODULE, sizeof(struct aaci));

	if (card == NULL)

		return ERR_PTR(-ENOMEM);

		return NULL;



	card->private_free = aaci_free_card;
@@ -1083,8 +1083,8 @@ static int __devinit aaci_probe(struct amba_device *dev, void *id) 
		return ret;



	aaci = aaci_init_card(dev);

	if (IS_ERR(aaci)) {

		ret = PTR_ERR(aaci);

	if (!aaci) {

		ret = -ENOMEM;

		goto out;

	}