diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-21 13:13:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-21 13:13:08 -0700 |
| commit | 413318444fd5351f9858b9deb4e8ecaf8898ee05 (patch) | |
| tree | c5ab72670ca792c800ca6c75e534c96df2cb80c7 /sound/soc | |
| parent | d06063cc221fdefcab86589e79ddfdb7c0e14b63 (diff) | |
| parent | 47166281d2dc9daf7da9a5ad88491ae94366e852 (diff) | |
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: hda - Add model=6530g option
ALSA: hda - Acer Inspire 6530G model for Realtek ALC888
ALSA: snd_usb_caiaq: fix legacy input streaming
ASoC: Kill BUS_ID_SIZE
ALSA: HDA - Correct trivial typos in comments.
ALSA: HDA - Name-fixes in code (tagra/targa)
ALSA: HDA - Add pci-quirk for MSI MS-7350 motherboard.
ALSA: hda - Fix memory leak at codec creation
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/txx9/txx9aclc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c index fa336616152e..938a58a5a244 100644 --- a/sound/soc/txx9/txx9aclc.c +++ b/sound/soc/txx9/txx9aclc.c @@ -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; |