diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-22 03:56:12 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 03:56:12 -0400 |
| commit | af1910a817c5ad52c32dddacc1744cfa1b35889e (patch) | |
| tree | 2d6504a2ac5971bb84e0172bbdd309b781048849 /sound/soc/nuc900/nuc900-pcm.c | |
| parent | 5495ffbd7b56d8bffebc5e30f03ea374590f1bb4 (diff) | |
| parent | f648de832dbf6d1947ce5a7c0ed24a3a71d8545b (diff) | |
Merge branch 'topic/asoc' into topic/remove-irqf_disable
Diffstat (limited to 'sound/soc/nuc900/nuc900-pcm.c')
| -rw-r--r-- | sound/soc/nuc900/nuc900-pcm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/nuc900/nuc900-pcm.c b/sound/soc/nuc900/nuc900-pcm.c index d589ef14e917..e46d5516e000 100644 --- a/sound/soc/nuc900/nuc900-pcm.c +++ b/sound/soc/nuc900/nuc900-pcm.c | |||
| @@ -318,7 +318,6 @@ static u64 nuc900_pcm_dmamask = DMA_BIT_MASK(32); | |||
| 318 | static int nuc900_dma_new(struct snd_soc_pcm_runtime *rtd) | 318 | static int nuc900_dma_new(struct snd_soc_pcm_runtime *rtd) |
| 319 | { | 319 | { |
| 320 | struct snd_card *card = rtd->card->snd_card; | 320 | struct snd_card *card = rtd->card->snd_card; |
| 321 | struct snd_soc_dai *dai = rtd->cpu_dai; | ||
| 322 | struct snd_pcm *pcm = rtd->pcm; | 321 | struct snd_pcm *pcm = rtd->pcm; |
| 323 | 322 | ||
| 324 | if (!card->dev->dma_mask) | 323 | if (!card->dev->dma_mask) |