Skip to contentSkip to conversation

sound fixes for 2.6.31

GIT PULL Takashi Iwai 1 participant 1 message Jun 21, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Linus,

please pull ALSA fixes for v2.6.31 from:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus

containing the following changes.

Thanks!

Takashi

===

Daniel Mack (1):
ALSA: snd_usb_caiaq: fix legacy input streaming

Sasha Alexandr (3):
ALSA: HDA - Add pci-quirk for MSI MS-7350 motherboard.
ALSA: HDA - Name-fixes in code (tagra/targa)
ALSA: HDA - Correct trivial typos in comments.

Takashi Iwai (3):
ALSA: hda - Fix memory leak at codec creation
ASoC: Kill BUS_ID_SIZE
ALSA: hda - Add model=6530g option

Tony Vroon (1):
ALSA: hda - Acer Inspire 6530G model for Realtek ALC888

---
 Documentation/sound/alsa/HD-Audio-Models.txt |    1 +
 sound/pci/hda/hda_codec.c                    |    2 -
 sound/pci/hda/patch_realtek.c                |  134 ++++++++++++++++++++------
 sound/soc/txx9/txx9aclc.c                    |    4 +-
 sound/usb/caiaq/audio.c                      |    5 +-
 sound/usb/caiaq/device.c                     |    2 +-
 6 files changed, 110 insertions(+), 38 deletions(-)
Documentation/sound/alsa/HD-Audio-Models.txt +1 -0
index de8e10a..0d8d235 100644
@@ -139,6 +139,7 @@ ALC883/888
   acer		Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)
   acer-aspire	Acer Aspire 9810
   acer-aspire-4930g Acer Aspire 4930G
+  acer-aspire-6530g Acer Aspire 6530G
   acer-aspire-8930g Acer Aspire 8930G
   medion	Medion Laptops
   medion-md2	Medion MD2
sound/pci/hda/hda_codec.c +0 -2
index 562403a..462e2ce 100644
@@ -972,8 +972,6 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
 			snd_hda_codec_read(codec, nid, 0,
 					   AC_VERB_GET_SUBSYSTEM_ID, 0);
 	}
-	if (bus->modelname)
-		codec->modelname = kstrdup(bus->modelname, GFP_KERNEL);
 
 	/* power-up all before initialization */
 	hda_set_power_state(codec,
sound/pci/hda/patch_realtek.c +103 -31

320 lines not on this page · raw message

sound/soc/txx9/txx9aclc.c +2 -2
index fa33661..938a58a 100644
@@ -297,9 +297,9 @@ static int txx9aclc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
 static bool filter(struct dma_chan *chan, void *param)
 {
 	struct txx9aclc_dmadata *dmadata = param;
-	char devname[BUS_ID_SIZE + 2];
+	char devname[20 + 2]; /* FIXME: old BUS_ID_SIZE + 2 */
 
-	sprintf(devname, "%s.%d", dmadata->dma_res->name,
+	snprintf(devname, sizeof(devname), "%s.%d", dmadata->dma_res->name,
 		(int)dmadata->dma_res->start);
 	if (strcmp(dev_name(chan->device->dev), devname) == 0) {
 		chan->private = &dmadata->dma_slave;
sound/usb/caiaq/audio.c +3 -2
index b144513..8f9b60c 100644
@@ -199,8 +199,9 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
 		dev->period_out_count[index] = BYTES_PER_SAMPLE + 1;
 		dev->audio_out_buf_pos[index] = BYTES_PER_SAMPLE + 1;
 	} else {
-		dev->period_in_count[index] = BYTES_PER_SAMPLE;
-		dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE;
+		int in_pos = (dev->spec.data_alignment == 2) ? 0 : 2;
+		dev->period_in_count[index] = BYTES_PER_SAMPLE + in_pos;
+		dev->audio_in_buf_pos[index] = BYTES_PER_SAMPLE + in_pos;
 	}
 
 	if (dev->streaming)
sound/usb/caiaq/device.c +1 -1
index 2240624..0e5db71 100644
@@ -35,7 +35,7 @@
 #include "input.h"
 
 MODULE_AUTHOR("Daniel Mack <[email protected]>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.3.16");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.3.17");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
 			 "{Native Instruments, RigKontrol3},"