aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-21 10:59:04 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-21 10:59:04 +0200
commit9fd0d96e799ef96f1394cbb67abc2a2e2b714ddc (patch)
tree0e346ea5283b7b42041ee318b69dde2b05c16086
parent3b13b5ce8c1b52379aff80666d31d4354354b2d4 (diff)
parentef39412622b6e8f09c383de9565b07e93553fc27 (diff)
Merge branch 'topic/asoc' into for-linus
* topic/asoc: ASoC: Kill BUS_ID_SIZE
-rw-r--r--sound/soc/txx9/txx9aclc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index fa336616152..938a58a5a24 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;