Skip to contentSkip to conversation

sound fixes for 4.2-rc3

GIT PULL Takashi Iwai 1 participant 1 message Jul 17, 2015 Sound

lore
Share & tools
lore
#0 lore raw

Linus,

please pull sound fixes for v4.2-rc3 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.2-rc3

The topmost commit is 98973f2f083a5ec580da8bbb685e6baa93613546

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

sound fixes for 4.2-rc3

There are two small fixes for HD-audio and USB LINE6, and the rest are a few new quirks and device ID addition that are good enough to get into 4.2.

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

Dominic Sacré (1):
ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4

Keith Packard (1):
ALSA: hda/realtek: Enable HP amp and mute LED on HP Folio 9480m [v3]

Libin Yang (1):
ALSA: hda - add codec ID for Broxton display audio codec

Takashi Iwai (2):
ALSA: hda - Fix a wrong busy check in alt PCM open
ALSA: line6: Fix -EBUSY error during active monitoring

---
 sound/pci/hda/hda_generic.c   |  2 +-
 sound/pci/hda/patch_hdmi.c    |  2 ++
 sound/pci/hda/patch_realtek.c | 55 ++++++++++++++++++++++++++++++++++
 sound/usb/line6/pcm.c         |  9 ++----
 sound/usb/quirks-table.h      | 68 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 128 insertions(+), 8 deletions(-)
sound/pci/hda/hda_generic.c +1 -1
index ac0db1679f09..b077bb644434 100644
@@ -5175,7 +5175,7 @@ static int alt_playback_pcm_open(struct hda_pcm_stream *hinfo,
 	int err = 0;
 
 	mutex_lock(&spec->pcm_mutex);
-	if (!spec->indep_hp_enabled)
+	if (spec->indep_hp && !spec->indep_hp_enabled)
 		err = -EBUSY;
 	else
 		spec->active_streams |= 1 << STREAM_INDEP_HP;
sound/pci/hda/patch_hdmi.c +2 -0
index 2f2433845d04..95158914cc6c 100644
@@ -3527,6 +3527,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
 { .id = 0x80862807, .name = "Haswell HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x80862808, .name = "Broadwell HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x80862809, .name = "Skylake HDMI",	.patch = patch_generic_hdmi },
+{ .id = 0x8086280a, .name = "Broxton HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x80862880, .name = "CedarTrail HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x80862882, .name = "Valleyview2 HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x80862883, .name = "Braswell HDMI",	.patch = patch_generic_hdmi },
@@ -3591,6 +3592,7 @@ MODULE_ALIAS("snd-hda-codec-id:80862806");
 MODULE_ALIAS("snd-hda-codec-id:80862807");
 MODULE_ALIAS("snd-hda-codec-id:80862808");
 MODULE_ALIAS("snd-hda-codec-id:80862809");
+MODULE_ALIAS("snd-hda-codec-id:8086280a");
 MODULE_ALIAS("snd-hda-codec-id:80862880");
 MODULE_ALIAS("snd-hda-codec-id:80862882");
 MODULE_ALIAS("snd-hda-codec-id:80862883");
sound/pci/hda/patch_realtek.c +55 -0

79 lines not on this page · raw message

sound/usb/line6/pcm.c +2 -7
index 8461d6bf992f..204cc074adb9 100644
@@ -186,12 +186,8 @@ static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction,
 	int ret = 0;
 
 	spin_lock_irqsave(&pstr->lock, flags);
-	if (!test_and_set_bit(type, &pstr->running)) {
-		if (pstr->active_urbs || pstr->unlink_urbs) {
-			ret = -EBUSY;
-			goto error;
-		}
-
+	if (!test_and_set_bit(type, &pstr->running) &&
+	    !(pstr->active_urbs || pstr->unlink_urbs)) {
 		pstr->count = 0;
 		/* Submit all currently available URBs */
 		if (direction == SNDRV_PCM_STREAM_PLAYBACK)
@@ -199,7 +195,6 @@ static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction,
 		else
 			ret = line6_submit_audio_in_all_urbs(line6pcm);
 	}
- error:
 	if (ret < 0)
 		clear_bit(type, &pstr->running);
 	spin_unlock_irqrestore(&pstr->lock, flags);
sound/usb/quirks-table.h +68 -0

74 lines not on this page · raw message