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

Commit 9dfea1b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: pcm_oss: AFMT_S24_LE is set twice in return value
  ALSA: ASoC: email - update email addresses.
  OMAP: ASoC: Fix spinlock misuse in omap-pcm.c
  ALSA: hda - No widget selection for volume knob widgets in proc output
  ALSA: hda - Add support of iMac 24 Aluminium
  ALSA: alsa: time reaches -1, tested 0
  ALSA: hda - Add quirk for another HP dv5 model
parents eda58a85 7df0eb42

sound/core/oss/pcm_oss.c

+1 −1
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file) 
		       AFMT_S8 | AFMT_U16_LE |

		       AFMT_U16_BE |

			AFMT_S32_LE | AFMT_S32_BE |

			AFMT_S24_LE | AFMT_S24_LE |

			AFMT_S24_LE | AFMT_S24_BE |

			AFMT_S24_PACKED;

	params = kmalloc(sizeof(*params), GFP_KERNEL);

	if (!params)

sound/pci/hda/hda_proc.c

+2 −1
Original line number Diff line number Diff line
@@ -399,7 +399,8 @@ static void print_conn_list(struct snd_info_buffer *buffer, 
{

	int c, curr = -1;



	if (conn_len > 1 && wid_type != AC_WID_AUD_MIX)

	if (conn_len > 1 && wid_type != AC_WID_AUD_MIX &&

	    wid_type != AC_WID_VOL_KNB)

		curr = snd_hda_codec_read(codec, nid, 0,

					  AC_VERB_GET_CONNECT_SEL, 0);

	snd_iprintf(buffer, "  Connection: %d\n", conn_len);

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -7012,6 +7012,7 @@ static int patch_alc882(struct hda_codec *codec) 
			break;

		case 0x106b1000: /* iMac 24 */

		case 0x106b2800: /* AppleTV */

		case 0x106b3e00: /* iMac 24 Aluminium */

			board_config = ALC885_IMAC24;

			break;

		case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */

sound/pci/hda/patch_sigmatel.c

+2 −0
Original line number Diff line number Diff line
@@ -1804,6 +1804,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { 
		      "HP dv4", STAC_HP_DV5),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x30fc,

		      "HP dv7", STAC_HP_M4),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3600,

		      "HP dv5", STAC_HP_DV5),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3603,

		      "HP dv5", STAC_HP_DV5),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361a,

sound/pci/intel8x0.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static int snd_intel8x0_ali_codec_semaphore(struct intel8x0 *chip) 
	int time = 100;

	if (chip->buggy_semaphore)

		return 0; /* just ignore ... */

	while (time-- && (igetdword(chip, ICHREG(ALI_CAS)) & ALI_CAS_SEM_BUSY))

	while (--time && (igetdword(chip, ICHREG(ALI_CAS)) & ALI_CAS_SEM_BUSY))

		udelay(1);

	if (! time && ! chip->in_ac97_init)

		snd_printk(KERN_WARNING "ali_codec_semaphore timeout\n");