diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-21 10:59:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-21 10:59:04 +0200 |
| commit | 9fd0d96e799ef96f1394cbb67abc2a2e2b714ddc (patch) | |
| tree | 0e346ea5283b7b42041ee318b69dde2b05c16086 | |
| parent | 3b13b5ce8c1b52379aff80666d31d4354354b2d4 (diff) | |
| parent | ef39412622b6e8f09c383de9565b07e93553fc27 (diff) | |
| download | op-kernel-dev-9fd0d96e799ef96f1394cbb67abc2a2e2b714ddc.zip op-kernel-dev-9fd0d96e799ef96f1394cbb67abc2a2e2b714ddc.tar.gz | |
Merge branch 'topic/asoc' into for-linus
* topic/asoc:
ASoC: Kill BUS_ID_SIZE
| -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 fa33661..938a58a 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; |
