mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Will Porter <mrwillporter@gmail.com>
To: Takashi Iwai <tiwai@suse.com>
Cc: "Jaroslav Kysela" <perex@perex.cz>,
	"Geoffrey D. Bennett" <g@b4.vu>,
	"Asahi Lina" <lina@asahilina.net>,
	"Chris J Arges" <chris.j.arges@canonical.com>,
	"Nick Kossifidis" <mickflemm@gmail.com>,
	"Detlef Urban" <onkel@paraair.de>,
	"Roy Vegard Ovesen" <roy.vegard.ovesen@gmail.com>,
	fenugrec <fenugrec@mail.com>,
	"Frederic Popp" <frederic.l.popp@t-online.de>,
	"Cássio Gabriel" <cassiogabrielcontato@gmail.com>,
	"Shipei Qu" <qu@darknavy.com>,
	linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Will Porter" <mrwillporter@gmail.com>
Subject: [PATCH 2/6] ALSA: usb-audio: Add PM guards to US-16x08 transfers
Date: Thu, 27 Aug 2026 18:21:39 -0500	[thread overview]
Message-ID: <20260827232143.149197-3-mrwillporter@gmail.com> (raw)
In-Reply-To: <20260827232143.149197-1-mrwillporter@gmail.com>

The TASCAM control helpers submit vendor requests without preventing
runtime suspend or disconnect. This affects mixer writes and the
volatile meter path.

Protect both send and receive helpers with snd_usb_lock. Acquire the PM
guard before chip->mutex in the receive path so autoresume cannot invert
the mutex order.

Assisted-by: Codex:gpt-5.6-sol
Signed-off-by: Will Porter <mrwillporter@gmail.com>
---
 sound/usb/mixer_us16x08.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sound/usb/mixer_us16x08.c b/sound/usb/mixer_us16x08.c
index ebff185cbd2c..14fb1ad764a7 100644
--- a/sound/usb/mixer_us16x08.c
+++ b/sound/usb/mixer_us16x08.c
@@ -151,6 +151,9 @@ static const char *const route_names[] = {
 static int snd_us16x08_recv_urb(struct snd_usb_audio *chip,
 	unsigned char *buf, int size)
 {
+	CLASS(snd_usb_lock, pm)(chip);
+	if (pm.err < 0)
+		return -EIO;
 
 	guard(mutex)(&chip->mutex);
 	snd_usb_ctl_msg(chip->dev,
@@ -165,6 +168,10 @@ static int snd_us16x08_recv_urb(struct snd_usb_audio *chip,
  */
 static int snd_us16x08_send_urb(struct snd_usb_audio *chip, char *buf, int size)
 {
+	CLASS(snd_usb_lock, pm)(chip);
+	if (pm.err < 0)
+		return -EIO;
+
 	return snd_usb_ctl_msg(chip->dev, usb_sndctrlpipe(chip->dev, 0),
 			SND_US16X08_URB_REQUEST, SND_US16X08_URB_REQUESTTYPE,
 			0, 0, buf, size);
-- 
2.47.3


  parent reply	other threads:[~2026-08-27 23:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-24 23:03 [RFC] ALSA: usb-audio: missing PM guards in device mixer paths Will Porter
2026-08-25  8:17 ` Takashi Iwai
2026-08-27 23:21 ` [PATCH 0/6] ALSA: usb-audio: guard device-specific control transfers Will Porter
2026-08-27 23:21   ` [PATCH 1/6] ALSA: usb-audio: Add PM guard to Studio 1810c controls Will Porter
2026-08-27 23:21   ` Will Porter [this message]
2026-08-27 23:21   ` [PATCH 3/6] ALSA: usb-audio: Add PM guard to Scarlett meter reads Will Porter
2026-08-27 23:21   ` [PATCH 4/6] ALSA: usb-audio: Guard Scarlett2 protocol transfers Will Porter
2026-08-27 23:21   ` [PATCH 5/6] ALSA: usb-audio: Add PM guards to RME Digiface controls Will Porter
2026-08-27 23:21   ` [PATCH 6/6] ALSA: usb-audio: Guard FCP protocol transfers Will Porter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260827232143.149197-3-mrwillporter@gmail.com \
    --to=mrwillporter@gmail.com \
    --cc=cassiogabrielcontato@gmail.com \
    --cc=chris.j.arges@canonical.com \
    --cc=fenugrec@mail.com \
    --cc=frederic.l.popp@t-online.de \
    --cc=g@b4.vu \
    --cc=lina@asahilina.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=mickflemm@gmail.com \
    --cc=onkel@paraair.de \
    --cc=perex@perex.cz \
    --cc=qu@darknavy.com \
    --cc=roy.vegard.ovesen@gmail.com \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®