Skip to content

Commit b7df09b

Browse files
committed
ALSA: us122l: Use snd_card_free_when_closed() at disconnection
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: 030a07e ("ALSA: Add USB US122L driver") Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/20241113111042.15058-3-tiwai@suse.de
1 parent dafb28f commit b7df09b

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

sound/usb/usx2y/us122l.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,7 @@ static void snd_us122l_disconnect(struct usb_interface *intf)
606606
usb_put_intf(usb_ifnum_to_if(us122l->dev, 1));
607607
usb_put_dev(us122l->dev);
608608

609-
while (atomic_read(&us122l->mmap_count))
610-
msleep(500);
611-
612-
snd_card_free(card);
609+
snd_card_free_when_closed(card);
613610
}
614611

615612
static int snd_us122l_suspend(struct usb_interface *intf, pm_message_t message)

0 commit comments

Comments
 (0)