Commit 9fd0d96e authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'topic/asoc' into for-linus

* topic/asoc:
  ASoC: Kill BUS_ID_SIZE
parents 3b13b5ce ef394126
...@@ -297,9 +297,9 @@ static int txx9aclc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, ...@@ -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) static bool filter(struct dma_chan *chan, void *param)
{ {
struct txx9aclc_dmadata *dmadata = 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); (int)dmadata->dma_res->start);
if (strcmp(dev_name(chan->device->dev), devname) == 0) { if (strcmp(dev_name(chan->device->dev), devname) == 0) {
chan->private = &dmadata->dma_slave; chan->private = &dmadata->dma_slave;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment