Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddd3b7fc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sound: usb: auto suspend device only if it supports remote wakeup"

parents 3bfb3b63 6449ed6a

sound/usb/card.c

+2 −0
Original line number Diff line number Diff line
@@ -715,6 +715,8 @@ static int usb_audio_probe(struct usb_interface *intf, 
	usb_chip[chip->index] = chip;

	chip->num_interfaces++;

	usb_set_intfdata(intf, chip);

	intf->needs_remote_wakeup = 1;

	usb_enable_autosuspend(chip->dev);

	atomic_dec(&chip->active);

	mutex_unlock(&register_mutex);

	return 0;

sound/usb/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ int snd_usb_enable_audio_stream(struct snd_usb_substream *subs, 
	snd_usb_autoresume(subs->stream->chip);

	fmt = find_format(subs);

	if (!fmt) {

		dev_dbg(&subs->dev->dev,

		dev_err(&subs->dev->dev,

		"cannot set format: format = %#x, rate = %d, channels = %d\n",

			   subs->pcm_format, subs->cur_rate, subs->channels);

		return -EINVAL;