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

Commit 3454a476 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next

parents 0be04a69 bcab3a6e

sound/core/pcm_native.c

+5 −1
Original line number Diff line number Diff line
@@ -3064,6 +3064,7 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream, 
{

	snd_pcm_uframes_t *frames = arg;

	snd_pcm_sframes_t result;

	int err;

	

	switch (cmd) {

	case SNDRV_PCM_IOCTL_FORWARD:
@@ -3083,7 +3084,10 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream, 
	case SNDRV_PCM_IOCTL_START:

		return snd_pcm_start_lock_irq(substream);

	case SNDRV_PCM_IOCTL_DRAIN:

		return snd_pcm_drain(substream, NULL);

		snd_power_lock(substream->pcm->card);

		err = snd_pcm_drain(substream, NULL);

		snd_power_unlock(substream->pcm->card);

		return err;

	case SNDRV_PCM_IOCTL_DROP:

		return snd_pcm_drop(substream);

	case SNDRV_PCM_IOCTL_DELAY:

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -947,6 +947,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004),

sound/soc/codecs/rt5677.c

+1 −0
Original line number Diff line number Diff line
@@ -5021,6 +5021,7 @@ static const struct regmap_config rt5677_regmap = { 
static const struct i2c_device_id rt5677_i2c_id[] = {

	{ "rt5677", RT5677 },

	{ "rt5676", RT5676 },

	{ "RT5677CE:00", RT5677 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, rt5677_i2c_id);