linux.git/sound, branch v3.3-rc5 Linux kernel source tree ALSA: snd-usb-caiaq: Fix the return of XRUN 2012-02-22T07:34:58+00:00 Mark Hills mark@pogo.org.uk 2012-02-21T21:26:31+00:00 cb74eb15ac88d6aacf7e58db1d8f8dadee710fd9 Commit 3702b08 added a lock, but did not account for the case of SNDRV_PCM_POS_XRUN, which would get immediately overwritten. This could be bundled into one if-else-if statement, but the goto helps to clarify the 'exceptional' case. Thanks to Andreas Pape for spotting this. Signed-off-by: Mark Hills <mark@pogo.org.uk> Acked-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> 
Commit 3702b08 added a lock, but did not account for the case of
SNDRV_PCM_POS_XRUN, which would get immediately overwritten.

This could be bundled into one if-else-if statement, but the goto
helps to clarify the 'exceptional' case.

Thanks to Andreas Pape for spotting this.

Signed-off-by: Mark Hills <mark@pogo.org.uk>
Acked-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 2012-02-21T20:21:57+00:00 Takashi Iwai tiwai@suse.de 2012-02-21T20:21:57+00:00 fe879e2f6d65648b6398ac27f4c623ebd2e867f7 A couple of small, driver specific fixes - nothing too exciting going on. 
A couple of small, driver specific fixes - nothing too exciting going
on.
ASoC: ak4642: fixup HeadPhone L/R dapm settings 2012-02-21T10:00:24+00:00 Kuninori Morimoto kuninori.morimoto.gx@renesas.com 2012-02-21T04:14:16+00:00 e555cf363167f09efae96d32a363e24c4de16b7b Current ak4642 driver had wrong dapm settings for headphone L/R. If you select headphone L, and select R after that, headphone L setting was removed by R settings. This patch fixes it up. It provides just "Headphone Enable" to user side Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> 
Current ak4642 driver had wrong dapm settings for headphone L/R.
If you select headphone L, and select R after that,
headphone L setting was removed by R settings.

This patch fixes it up.
It provides just "Headphone Enable" to user side

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
ALSA: hda/realtek - Fix surround output regression on Acer Aspire 5935 2012-02-17T09:28:06+00:00 Takashi Iwai tiwai@suse.de 2012-02-17T09:12:38+00:00 ef8d60fb79614a86a82720dc2402631dbcafb315 The previous fix for the speaker on Acer Aspire 59135 introduced another problem for surround outputs. It changed the connections on the line-in/mic pins for limiting the routes, but it left the modified connections. Thus wrong connection indices were written when set to 4ch or 6ch mode. This patch fixes it by restoring the right connections just after parsing the tree but before the initialization. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42740 Cc: <stable@kernel.org> [v3.2+] Signed-off-by: Takashi Iwai <tiwai@suse.de> 
The previous fix for the speaker on Acer Aspire 59135 introduced
another problem for surround outputs.  It changed the connections on
the line-in/mic pins for limiting the routes, but it left the modified
connections.  Thus wrong connection indices were written when set to
4ch or 6ch mode.

This patch fixes it by restoring the right connections just after
parsing the tree but before the initialization.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42740

Cc: <stable@kernel.org> [v3.2+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
ALSA: hda/realtek - Fix overflow of vol/sw check bitmap 2012-02-16T15:39:14+00:00 Takashi Iwai tiwai@suse.de 2012-02-16T15:38:07+00:00 c14c95f62ecb8710af14ae0d48e01991b70bb6f4 The bitmap introduced in the commit [527e4d73: ALSA: hda/realtek - Fix missing volume controls with ALC260] is too narrow for some codecs, which may have more NIDs than 0x20, thus it may overflow the bitmap array on them. Just double the number to cover all and also add a sanity-check code to be safer. Cc: <stable@kernel.org> [v3.2+] Signed-off-by: Takashi Iwai <tiwai@suse.de> 
The bitmap introduced in the commit [527e4d73: ALSA: hda/realtek - Fix
missing volume controls with ALC260] is too narrow for some codecs,
which may have more NIDs than 0x20, thus it may overflow the bitmap
array on them.

Just double the number to cover all and also add a sanity-check code
to be safer.

Cc: <stable@kernel.org> [v3.2+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
ALSA: usb-audio: avoid integer overflow in create_fixed_stream_quirk() 2012-02-15T13:58:15+00:00 Xi Wang xi.wang@gmail.com 2012-02-14T10:18:48+00:00 8866f405efd4171f9d9c91901d2dd02f01bacb60 A malicious USB device could feed in a large nr_rates value. This would cause the subsequent call to kmemdup() to allocate a smaller buffer than expected, leading to out-of-bounds access. This patch validates the nr_rates value and reuses the limit introduced in commit 4fa0e81b ("ALSA: usb-audio: fix possible hang and overflow in parse_uac2_sample_rate_range()"). Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> 
A malicious USB device could feed in a large nr_rates value.  This would
cause the subsequent call to kmemdup() to allocate a smaller buffer than
expected, leading to out-of-bounds access.

This patch validates the nr_rates value and reuses the limit introduced
in commit 4fa0e81b ("ALSA: usb-audio: fix possible hang and overflow
in parse_uac2_sample_rate_range()").

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
ASoC: wm8962: Fix sidetone enumeration texts 2012-02-14T21:54:45+00:00 Mark Brown broonie@opensource.wolfsonmicro.com 2012-02-14T06:00:47+00:00 31794bc37bf2db84f085da52b72bfba65739b2d2 The sidetone enumeration texts have left and right swapped. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org 
The sidetone enumeration texts have left and right swapped.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@vger.kernel.org
ALSA: intel8x0: Fix default inaudible sound on Gateway M520 2012-02-14T08:33:47+00:00 Daniel T Chen crimsun@ubuntu.com 2012-02-14T04:44:22+00:00 27c3afe6e1cf129faac90405121203962da08ff4 BugLink: https://bugs.launchpad.net/bugs/930842 The reporter states that audio is inaudible by default without muting 'External Amplifier'. Add a quirk to handle his SSID so that changing the control is not necessary. Reported-and-tested-by: Benjamin Carlson <elderbubba0810@gmail.com> Cc: <stable@kernel.org> Signed-off-by: Daniel T Chen <crimsun@ubuntu.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> 
BugLink: https://bugs.launchpad.net/bugs/930842

The reporter states that audio is inaudible by default without muting
'External Amplifier'. Add a quirk to handle his SSID so that changing
the control is not necessary.

Reported-and-tested-by: Benjamin Carlson <elderbubba0810@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus 2012-02-14T08:24:58+00:00 Takashi Iwai tiwai@suse.de 2012-02-14T08:24:58+00:00 675c67afb6a05907d9683ef176f41852bb1b5b9d A simple fix from Morimoto-san for the pointer() operation in the FSI driver. 
A simple fix from Morimoto-san for the pointer() operation in the FSI
driver.
Merge branch 'fix/acer-alc889-fix' into fix/hda 2012-02-13T14:34:31+00:00 Takashi Iwai tiwai@suse.de 2012-02-13T14:34:31+00:00 a68f20ef80e62b3dfed3097ad57ec88550cdabe7 Conflicts: sound/pci/hda/patch_realtek.c Merged back the fix for Acer Aspire 6935 with ALC889 codec. The fix commit was based on 3.2 kernel so that it can be applied to stable kernel cleanly. 
Conflicts:
	sound/pci/hda/patch_realtek.c

Merged back the fix for Acer Aspire 6935 with ALC889 codec.
The fix commit was based on 3.2 kernel so that it can be applied to
stable kernel cleanly.