From 73d38b13ffb105ab633bd91969c8d218b2de38d4 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 17 Apr 2008 12:50:47 +0200 Subject: [ALSA] Fix the race of card instance unregistration Move the call of device_unregister() for the card instance in snd_card_disconnect() to avoid the race of sysfs card entry, which can be typically found on usb-audio reconnection. Signed-off-by: Takashi Iwai --- sound/core/init.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sound') diff --git a/sound/core/init.c b/sound/core/init.c index f045f7db3ab..07acac77ea4 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -360,6 +360,12 @@ int snd_card_disconnect(struct snd_card *card) snd_printk(KERN_ERR "not all devices for card %i can be disconnected\n", card->number); snd_info_card_disconnect(card); +#ifndef CONFIG_SYSFS_DEPRECATED + if (card->card_dev) { + device_unregister(card->card_dev); + card->card_dev = NULL; + } +#endif return 0; } @@ -401,10 +407,6 @@ static int snd_card_do_free(struct snd_card *card) snd_printk(KERN_WARNING "unable to free card info\n"); /* Not fatal error */ } -#ifndef CONFIG_SYSFS_DEPRECATED - if (card->card_dev) - device_unregister(card->card_dev); -#endif kfree(card); return 0; } -- cgit v1.2.3