git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/hisi...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
fsl
/
mpc5200_dma.c
diff --git
a/sound/soc/fsl/mpc5200_dma.c
b/sound/soc/fsl/mpc5200_dma.c
index 0b82e209b6e38d9a10723b5f27fb62af7f6481f1..1f7e70bfbd5506a4088143d8ee9dfff0e059ee2d 100644
(file)
--- a/
sound/soc/fsl/mpc5200_dma.c
+++ b/
sound/soc/fsl/mpc5200_dma.c
@@
-302,7
+302,6
@@
static int psc_dma_new(struct snd_soc_pcm_runtime *rtd)
struct snd_card *card = rtd->card->snd_card;
struct snd_soc_dai *dai = rtd->cpu_dai;
struct snd_pcm *pcm = rtd->pcm;
- struct psc_dma *psc_dma = snd_soc_dai_get_drvdata(rtd->cpu_dai);
size_t size = psc_dma_hardware.buffer_bytes_max;
int rc;