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

Commit a2a6937d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Here are a few small fix patches for 3.20-rc1:

   - Quirks for Denon and Lifecam USB-audio devices and HD-audio on HP
     laptops
   - A long-time regression fix for HDSP eMADI
   - Add missing DRAIN_TRIGGER flag set for ASoC intel-sst
   - Trivial fixes for sequencer core and HD-audio Tegra, a LINE6
     cleanup"

* tag 'sound-fix-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb: Fix support for Denon DA-300USB DAC (ID 154e:1003)
  ASoC: Intel: add SNDRV_PCM_INFO_DRAIN_TRIGGER flag
  ALSA: usb-audio: Don't attempt to get Lifecam HD-5000 sample rate
  ALSA: hda/tegra check correct return value from ioremap_resource
  ALSA: hdspm - Constrain periods to 2 on older cards
  ALSA: hda - enable mute led quirk for one more hp machine.
  ALSA: seq: potential out of bounds in do_control()
  ALSA: line6: Improve line6_read/write_data() interfaces
parents f5e25f0d 3cd1ce04

sound/core/seq/seq_midi_emul.c

+3 −0
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ do_control(struct snd_midi_op *ops, void *drv, struct snd_midi_channel_set *chse 
{

	int  i;



	if (control >= ARRAY_SIZE(chan->control))

		return;



	/* Switches */

	if ((control >=64 && control <=69) || (control >= 80 && control <= 83)) {

		/* These are all switches; either off or on so set to 0 or 127 */

sound/pci/hda/hda_tegra.c

+2 −2
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ static int hda_tegra_init_chip(struct azx *chip, struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	hda->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(chip->remap_addr))

		return PTR_ERR(chip->remap_addr);

	if (IS_ERR(hda->regs))

		return PTR_ERR(hda->regs);



	chip->remap_addr = hda->regs + HDA_BAR0;

	chip->addr = res->start + HDA_BAR0;

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -4937,6 +4937,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x218b, "HP", ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x225f, "HP", ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY),

	/* ALC282 */

	SND_PCI_QUIRK(0x103c, 0x21f9, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2210, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2214, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1),

	SND_PCI_QUIRK(0x103c, 0x2236, "HP", ALC269_FIXUP_HP_LINE1_MIC1_LED),

sound/pci/rme9652/hdspm.c

+6 −0
Original line number Diff line number Diff line
@@ -6082,6 +6082,9 @@ static int snd_hdspm_playback_open(struct snd_pcm_substream *substream) 
		snd_pcm_hw_constraint_minmax(runtime,

					     SNDRV_PCM_HW_PARAM_PERIOD_SIZE,

					     64, 8192);

		snd_pcm_hw_constraint_minmax(runtime,

					     SNDRV_PCM_HW_PARAM_PERIODS,

					     2, 2);

		break;

	}
@@ -6156,6 +6159,9 @@ static int snd_hdspm_capture_open(struct snd_pcm_substream *substream) 
		snd_pcm_hw_constraint_minmax(runtime,

					     SNDRV_PCM_HW_PARAM_PERIOD_SIZE,

					     64, 8192);

		snd_pcm_hw_constraint_minmax(runtime,

					     SNDRV_PCM_HW_PARAM_PERIODS,

					     2, 2);

		break;

	}

sound/soc/intel/sst-haswell-pcm.c

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ static const struct snd_pcm_hardware hsw_pcm_hardware = { 
				  SNDRV_PCM_INFO_INTERLEAVED |

				  SNDRV_PCM_INFO_PAUSE |

				  SNDRV_PCM_INFO_RESUME |

				  SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,

				  SNDRV_PCM_INFO_NO_PERIOD_WAKEUP |

				  SNDRV_PCM_INFO_DRAIN_TRIGGER,

	.formats		= SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |

				  SNDRV_PCM_FMTBIT_S32_LE,

	.period_bytes_min	= PAGE_SIZE,