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

Commit c949e3d6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents 37fa84d8 0defe09c

sound/core/oss/pcm_oss.c

+11 −8
Original line number Diff line number Diff line
@@ -1510,16 +1510,19 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use 
static int snd_pcm_oss_reset(struct snd_pcm_oss_file *pcm_oss_file)

{

	struct snd_pcm_substream *substream;

	struct snd_pcm_runtime *runtime;

	int i;



	substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK];

	if (substream != NULL) {

		snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);

		substream->runtime->oss.prepare = 1;

	}

	substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_CAPTURE];

	if (substream != NULL) {

	for (i = 0; i < 2; i++) { 

		substream = pcm_oss_file->streams[i];

		if (!substream)

			continue;

		runtime = substream->runtime;

		snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);

		substream->runtime->oss.prepare = 1;

		runtime->oss.prepare = 1;

		runtime->oss.buffer_used = 0;

		runtime->oss.prev_hw_ptr_period = 0;

		runtime->oss.period_ptr = 0;

	}

	return 0;

}

sound/pci/hda/patch_realtek.c

+0 −1
Original line number Diff line number Diff line
@@ -9865,7 +9865,6 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763),

	SND_PCI_QUIRK(0x17aa, 0x3bfd, "Lenovo NB0763", ALC883_LENOVO_NB0763),

	SND_PCI_QUIRK(0x17aa, 0x101d, "Lenovo Sky", ALC888_LENOVO_SKY),

	SND_PCI_QUIRK(0x17c0, 0x4071, "MEDION MD2", ALC883_MEDION_MD2),

	SND_PCI_QUIRK(0x17c0, 0x4085, "MEDION MD96630", ALC888_LENOVO_MS7195_DIG),

	SND_PCI_QUIRK(0x17f2, 0x5000, "Albatron KI690-AM2", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),

sound/pci/hda/patch_sigmatel.c

+2 −0
Original line number Diff line number Diff line
@@ -1627,6 +1627,8 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { 
static struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02a1,

		      "Alienware M17x", STAC_ALIENWARE_M17X),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x043a,

		      "Alienware M17x", STAC_ALIENWARE_M17X),

	{} /* terminator */

};