From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 21 Jun 2009 08:59:04 +0000 (+0200)
Subject: Merge branch 'topic/asoc' into for-linus
X-Git-Tag: v2.6.31-rc1~86^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=9fd0d96e799ef96f1394cbb67abc2a2e2b714ddc;hp=3b13b5ce8c1b52379aff80666d31d4354354b2d4

Merge branch 'topic/asoc' into for-linus

* topic/asoc:
  ASoC: Kill BUS_ID_SIZE
---

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;