Skip to contentSkip to conversation

sound fixes for 5.5-rc2

GIT PULL Merged Takashi Iwai 2 participants 2 messages Dec 13, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v5.5-rc2 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.5-rc2

The topmost commit is 5815bdfd7f54739be9abed1301d55f5e74d7ad1f

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

sound fixes for 5.5-rc2

A small collection of fixes. The main changes are fixes for a couple of regressions in AMD HD-audio and FireWire that were introduced in 5.5-rc1. The rest are small fixes for echoaudio and FireWire, as well as a usual Dell HD-audio fixup.

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

Hui Wang (1):
ALSA: hda/realtek - Line-out jack doesn't work on a Dell AIO

Lukas Wunner (1):
ALSA: hda/hdmi - Fix duplicate unref of pci_dev

Olof Johansson (1):
ALSA: echoaudio: simplify get_audio_levels

Takashi Sakamoto (3):
ALSA: firewire-motu: fix double unlocked 'motu->mutex'
ALSA: oxfw: fix return value in error path of isochronous resources reservation
ALSA: fireface: fix return value in error path of isochronous resources reservation

---
 sound/firewire/fireface/ff-pcm.c    |  2 +-
 sound/firewire/motu/motu-pcm.c      |  8 ++------
 sound/firewire/oxfw/oxfw-pcm.c      |  2 +-
 sound/pci/echoaudio/echoaudio_dsp.c | 20 +++++++-------------
 sound/pci/hda/hda_intel.c           |  1 -
 sound/pci/hda/patch_realtek.c       |  8 +++-----
 6 files changed, 14 insertions(+), 27 deletions(-)
sound/firewire/fireface/ff-pcm.c +1 -1
index 4e3bd9a2bec0..bd91c6ecb112 100644
@@ -247,7 +247,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
 		mutex_unlock(&ff->mutex);
 	}
 
-	return 0;
+	return err;
 }
 
 static int pcm_hw_free(struct snd_pcm_substream *substream)
sound/firewire/motu/motu-pcm.c +2 -6
index 349b4d09e84f..005970931030 100644
@@ -177,18 +177,14 @@ static int pcm_open(struct snd_pcm_substream *substream)
 			err = snd_pcm_hw_constraint_minmax(substream->runtime,
 					SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
 					frames_per_period, frames_per_period);
-			if (err < 0) {
-				mutex_unlock(&motu->mutex);
+			if (err < 0)
 				goto err_locked;
-			}
 
 			err = snd_pcm_hw_constraint_minmax(substream->runtime,
 					SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
 					frames_per_buffer, frames_per_buffer);
-			if (err < 0) {
-				mutex_unlock(&motu->mutex);
+			if (err < 0)
 				goto err_locked;
-			}
 		}
 	}
 
sound/firewire/oxfw/oxfw-pcm.c +1 -1
index 9124603edabe..67fd3e844dd6 100644
@@ -285,7 +285,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
 		mutex_unlock(&oxfw->mutex);
 	}
 
-	return 0;
+	return err;
 }
 
 static int pcm_capture_hw_free(struct snd_pcm_substream *substream)
sound/pci/echoaudio/echoaudio_dsp.c +7 -13
index 50d4a87a6bb3..f02f5b1568de 100644
@@ -635,36 +635,30 @@ This function assumes there are no more than 16 in/out busses or pipes
 Meters is an array [3][16][2] of long. */
 static void get_audio_meters(struct echoaudio *chip, long *meters)
 {
-	int i, m, n;
+	unsigned int i, m, n;
 
-	m = 0;
-	n = 0;
-	for (i = 0; i < num_busses_out(chip); i++, m++) {
+	for (i = 0 ; i < 96; i++)
+		meters[i] = 0;
+
+	for (m = 0, n = 0, i = 0; i < num_busses_out(chip); i++, m++) {
 		meters[n++] = chip->comm_page->vu_meter[m];
 		meters[n++] = chip->comm_page->peak_meter[m];
 	}
-	for (; n < 32; n++)
-		meters[n] = 0;
 
 #ifdef ECHOCARD_ECHO3G
 	m = E3G_MAX_OUTPUTS;	/* Skip unused meters */
 #endif
 
-	for (i = 0; i < num_busses_in(chip); i++, m++) {
+	for (n = 32, i = 0; i < num_busses_in(chip); i++, m++) {
 		meters[n++] = chip->comm_page->vu_meter[m];
 		meters[n++] = chip->comm_page->peak_meter[m];
 	}
-	for (; n < 64; n++)
-		meters[n] = 0;
-
 #ifdef ECHOCARD_HAS_VMIXER
-	for (i = 0; i < num_pipes_out(chip); i++, m++) {
+	for (n = 64, i = 0; i < num_pipes_out(chip); i++, m++) {
 		meters[n++] = chip->comm_page->vu_meter[m];
 		meters[n++] = chip->comm_page->peak_meter[m];
 	}
 #endif
-	for (; n < 96; n++)
-		meters[n] = 0;
 }
 
 
sound/pci/hda/hda_intel.c +0 -1
index 35b4526f0d28..b856b89378ac 100644
@@ -1419,7 +1419,6 @@ static bool atpx_present(void)
 				return true;
 			}
 		}
-		pci_dev_put(pdev);
 	}
 	return false;
 }
sound/pci/hda/patch_realtek.c +3 -5
index 6d6e34b3b3aa..dbfafee97931 100644
@@ -7643,11 +7643,6 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = {
 		{0x1a, 0x90a70130},
 		{0x1b, 0x90170110},
 		{0x21, 0x03211020}),
-	SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
-		{0x12, 0xb7a60130},
-		{0x13, 0xb8a61140},
-		{0x16, 0x90170110},
-		{0x21, 0x04211020}),
 	SND_HDA_PIN_QUIRK(0x10ec0280, 0x103c, "HP", ALC280_FIXUP_HP_GPIO4,
 		{0x12, 0x90a60130},
 		{0x14, 0x90170110},
@@ -7841,6 +7836,9 @@ static const struct snd_hda_pin_quirk alc269_fallback_pin_fixup_tbl[] = {
 	SND_HDA_PIN_QUIRK(0x10ec0236, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,
 		{0x19, 0x40000000},
 		{0x1a, 0x40000000}),
+	SND_HDA_PIN_QUIRK(0x10ec0274, 0x1028, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
+		{0x19, 0x40000000},
+		{0x1a, 0x40000000}),
 	{}
 };
 
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 13 Dec 2019 12:17:14 +0100:

The pull request you sent on Fri, 13 Dec 2019 12:17:14 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.5-rc2

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

Thank you!

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