]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: us122l: Use snd_card_free_when_closed() at disconnection
authorTakashi Iwai <tiwai@suse.de>
Wed, 13 Nov 2024 11:10:36 +0000 (12:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 09:59:33 +0000 (10:59 +0100)
[ Upstream commit b7df09bb348016943f56b09dcaafe221e3f73947 ]

The USB disconnect callback is supposed to be short and not too-long
waiting.  OTOH, the current code uses snd_card_free() at
disconnection, but this waits for the close of all used fds, hence it
can take long.  It eventually blocks the upper layer USB ioctls, which
may trigger a soft lockup.

An easy workaround is to replace snd_card_free() with
snd_card_free_when_closed().  This variant returns immediately while
the release of resources is done asynchronously by the card device
release at the last close.

The loop of us122l->mmap_count check is dropped as well.  The check is
useless for the asynchronous operation with *_when_closed().

Fixes: 030a07e44129 ("ALSA: Add USB US122L driver")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20241113111042.15058-3-tiwai@suse.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/usb/usx2y/us122l.c

index 8082f7b077f187453a38db038345eaa41d4c9a1e..eac2e4d0e7d94df3cb88b763cccc9766963e32b3 100644 (file)
@@ -649,10 +649,7 @@ static void snd_us122l_disconnect(struct usb_interface *intf)
        usb_put_intf(usb_ifnum_to_if(us122l->dev, 1));
        usb_put_dev(us122l->dev);
 
-       while (atomic_read(&us122l->mmap_count))
-               msleep(500);
-
-       snd_card_free(card);
+       snd_card_free_when_closed(card);
 }
 
 static int snd_us122l_suspend(struct usb_interface *intf, pm_message_t message)