git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/ice' into for-linus
[pandora-kernel.git]
/
sound
/
soc
/
au1x
/
dbdma2.c
diff --git
a/sound/soc/au1x/dbdma2.c
b/sound/soc/au1x/dbdma2.c
index
74c823d
..
30490a2
100644
(file)
--- a/
sound/soc/au1x/dbdma2.c
+++ b/
sound/soc/au1x/dbdma2.c
@@
-187,7
+187,7
@@
static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd,
au1x_pcm_dmatx_cb, (void *)pcd);
if (!pcd->ddma_chan)
au1x_pcm_dmatx_cb, (void *)pcd);
if (!pcd->ddma_chan)
- return -ENOMEM;
;
+ return -ENOMEM;
au1xxx_dbdma_set_devwidth(pcd->ddma_chan, msbits);
au1xxx_dbdma_ring_alloc(pcd->ddma_chan, 2);
au1xxx_dbdma_set_devwidth(pcd->ddma_chan, msbits);
au1xxx_dbdma_ring_alloc(pcd->ddma_chan, 2);
@@
-305,7
+305,7
@@
static int au1xpsc_pcm_close(struct snd_pcm_substream *substream)
return 0;
}
return 0;
}
-struct snd_pcm_ops au1xpsc_pcm_ops = {
+st
atic st
ruct snd_pcm_ops au1xpsc_pcm_ops = {
.open = au1xpsc_pcm_open,
.close = au1xpsc_pcm_close,
.ioctl = snd_pcm_lib_ioctl,
.open = au1xpsc_pcm_open,
.close = au1xpsc_pcm_close,
.ioctl = snd_pcm_lib_ioctl,