Skip to contentSkip to conversation

sound: usb: get lock before calling usb_enable_autosuspend()

PATCH In review Salah Triki 2 participants 2 messages Aug 2, 2021 – Aug 3, 2021 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sound: usb: get lock before calling usb_enable_autosuspend()

Based on the documentation of usb_enable_autosuspend(), the caller must hold udev's device lock.

---
 sound/usb/card.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
sound/usb/card.c +7 -2
index 2f6a62416c05..9290ba0acd5f 100644
@@ -907,8 +907,13 @@ static void usb_audio_disconnect(struct usb_interface *intf)
 		}
 	}
 
-	if (chip->quirk_type & QUIRK_SETUP_DISABLE_AUTOSUSPEND)
-		usb_enable_autosuspend(interface_to_usbdev(intf));
+	if (chip->quirk_type & QUIRK_SETUP_DISABLE_AUTOSUSPEND) {
+		struct usb_device *udev = interface_to_usbdev(intf);
+
+		usb_lock_device(udev);
+		usb_enable_autosuspend(udev);
+		usb_unlock_device(udev);
+	}
 
 	chip->num_interfaces--;
 	if (chip->num_interfaces <= 0) {
Signature · 1 line
2.25.1
#1 lore raw
Quoted 3 lines · Salah Triki

Based on the documentation of usb_enable_autosuspend(), the caller must hold udev's device lock.

The device lock is already held in the caller side (in the driver core), hence this change will lead to a deadlock.

thanks,

Takashi

Quoted 29 lines
---
 sound/usb/card.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
sound/usb/card.c +7 -2
index 2f6a62416c05..9290ba0acd5f 100644
@@ -907,8 +907,13 @@ static void usb_audio_disconnect(struct usb_interface *intf)
 		}
 	}
 
-	if (chip->quirk_type & QUIRK_SETUP_DISABLE_AUTOSUSPEND)
-		usb_enable_autosuspend(interface_to_usbdev(intf));
+	if (chip->quirk_type & QUIRK_SETUP_DISABLE_AUTOSUSPEND) {
+		struct usb_device *udev = interface_to_usbdev(intf);
+
+		usb_lock_device(udev);
+		usb_enable_autosuspend(udev);
+		usb_unlock_device(udev);
+	}
 
 	chip->num_interfaces--;
 	if (chip->num_interfaces <= 0) {
Signature · 1 line
2.25.1