Skip to contentSkip to conversation

sound fixes for 5.0-rc5

GIT PULL Merged Takashi Iwai 2 participants 2 messages Jan 31, 2019 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v5.0-rc5 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0-rc5

The topmost commit is 693abe11aa6b27aed6eb8222162f8fb986325cef

----------------------------------------------------------------

sound fixes for 5.0-rc5

Only three fixes: a fix for Realtek HD-audio looks lengthy, but it's just a code shuffling, and the actual changes are fairly small. The rest are a PCM core fix for a long-standing bug that was recently scratched by syzkaller, and a trivial USB-audio quirk for DSD support.

----------------------------------------------------------------

Kailang Yang (1):
ALSA: hda/realtek - Fixed hp_pin no value

Olek Poplavsky (1):
ALSA: usb-audio: Add Opus #3 to quirks for native DSD support

Takashi Iwai (1):
ALSA: pcm: Fix tight loop of OSS capture stream

---
 sound/core/pcm_lib.c          |  9 ++++-
 sound/pci/hda/patch_realtek.c | 78 +++++++++++++++++++++++++------------------
 sound/usb/quirks.c            |  1 +
 3 files changed, 54 insertions(+), 34 deletions(-)
sound/core/pcm_lib.c +8 -1
index 40013b26f671..6c99fa8ac5fa 100644
@@ -2112,6 +2112,13 @@ int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream,
 	return 0;
 }
 
+/* allow waiting for a capture stream that hasn't been started */
+#if IS_ENABLED(CONFIG_SND_PCM_OSS)
+#define wait_capture_start(substream)	((substream)->oss.oss)
+#else
+#define wait_capture_start(substream)	false
+#endif
+
 /* the common loop for read/write data */
 snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,
 				     void *data, bool interleaved,
@@ -2182,7 +2189,7 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,
 			err = snd_pcm_start(substream);
 			if (err < 0)
 				goto _end_unlock;
-		} else {
+		} else if (!wait_capture_start(substream)) {
 			/* nothing to do */
 			err = 0;
 			goto _end_unlock;
sound/pci/hda/patch_realtek.c +45 -33

108 lines not on this page · raw message

sound/usb/quirks.c +1 -0
index ebbadb3a7094..bb8372833fc2 100644
@@ -1492,6 +1492,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,
 			return SNDRV_PCM_FMTBIT_DSD_U32_BE;
 		break;
 
+	case USB_ID(0x10cb, 0x0103): /* The Bit Opus #3; with fp->dsd_raw */
 	case USB_ID(0x152a, 0x85de): /* SMSL D1 DAC */
 	case USB_ID(0x16d0, 0x09dd): /* Encore mDSD */
 	case USB_ID(0x0d8c, 0x0316): /* Hegel HD12 DSD */
merge bot Merged
#1 lore raw
The pull request you sent on Thu, 31 Jan 2019 12:32:28 +0100:

The pull request you sent on Thu, 31 Jan 2019 12:32:28 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0-rc5

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/83f4997a01e72844045a2bf1f348359a1acbfb19

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker