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 1/6] ALSA: usb-audio: Add PM guard to Studio 1810c controls
Date: Thu, 27 Aug 2026 18:21:38 -0500	[thread overview]
Message-ID: <20260827232143.149197-2-mrwillporter@gmail.com> (raw)
In-Reply-To: <20260827232143.149197-1-mrwillporter@gmail.com>

The Studio 1810c control callbacks issue vendor transfers without
preventing runtime suspend or disconnect. A transfer attempted after
runtime suspend can fail because the USB device cannot accept
submissions.

Take snd_usb_lock before the driver data and USB mutexes in both
callbacks. This resumes the device before either the state read or
control write. It also prevents disconnect cleanup from racing the
complete operation.

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

diff --git a/sound/usb/mixer_s1810c.c b/sound/usb/mixer_s1810c.c
index 2e5a8d37ec57..bdb5e3aaff3b 100644
--- a/sound/usb/mixer_s1810c.c
+++ b/sound/usb/mixer_s1810c.c
@@ -474,6 +474,10 @@ snd_s1810c_switch_get(struct snd_kcontrol *kctl,
 	u32 state = 0;
 	int ret;
 
+	CLASS(snd_usb_lock, pm)(mixer->chip);
+	if (pm.err < 0)
+		return -EIO;
+
 	guard(mutex)(&private->data_mutex);
 	ret = snd_s1810c_get_switch_state(mixer, kctl, &state);
 	if (ret < 0)
@@ -504,6 +508,10 @@ snd_s1810c_switch_set(struct snd_kcontrol *kctl,
 	u32 newval = 0;
 	int ret = 0;
 
+	CLASS(snd_usb_lock, pm)(mixer->chip);
+	if (pm.err < 0)
+		return -EIO;
+
 	guard(mutex)(&private->data_mutex);
 	ret = snd_s1810c_get_switch_state(mixer, kctl, &curval);
 	if (ret < 0)
-- 
2.47.3


  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   ` Will Porter [this message]
2026-08-27 23:21   ` [PATCH 2/6] ALSA: usb-audio: Add PM guards to US-16x08 transfers Will Porter
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-2-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®