Commit 951606a1 authored by Dmitry Fomin's avatar Dmitry Fomin Committed by Takashi Iwai

ALSA: ice1712: Do not left ice->gpio_mutex locked in aureon_add_controls()

If snd_ctl_add() fails in aureon_add_controls(), it immediately returns
and leaves ice->gpio_mutex locked. ice->gpio_mutex locks in
snd_ice1712_save_gpio_status and unlocks in
snd_ice1712_restore_gpio_status(ice).

It seems that the mutex is required only for aureon_cs8415_get(),
so snd_ice1712_restore_gpio_status(ice) can be placed
just after that. Compile tested only.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarDmitry Fomin <fomindmitriyfoma@mail.ru>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20230225184322.6286-1-fomindmitriyfoma@mail.ruSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ea24b995
...@@ -1892,6 +1892,7 @@ static int aureon_add_controls(struct snd_ice1712 *ice) ...@@ -1892,6 +1892,7 @@ static int aureon_add_controls(struct snd_ice1712 *ice)
unsigned char id; unsigned char id;
snd_ice1712_save_gpio_status(ice); snd_ice1712_save_gpio_status(ice);
id = aureon_cs8415_get(ice, CS8415_ID); id = aureon_cs8415_get(ice, CS8415_ID);
snd_ice1712_restore_gpio_status(ice);
if (id != 0x41) if (id != 0x41)
dev_info(ice->card->dev, dev_info(ice->card->dev,
"No CS8415 chip. Skipping CS8415 controls.\n"); "No CS8415 chip. Skipping CS8415 controls.\n");
...@@ -1909,7 +1910,6 @@ static int aureon_add_controls(struct snd_ice1712 *ice) ...@@ -1909,7 +1910,6 @@ static int aureon_add_controls(struct snd_ice1712 *ice)
kctl->id.device = ice->pcm->device; kctl->id.device = ice->pcm->device;
} }
} }
snd_ice1712_restore_gpio_status(ice);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment