projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[deliverable/linux.git]
/
sound
/
soc
/
sh
/
fsi.c
diff --git
a/sound/soc/sh/fsi.c
b/sound/soc/sh/fsi.c
index 53486ff9c2afab75064de91599a2e1297a744359..0540408a9fa9ab706c28e7ef6ed60a329bec027c 100644
(file)
--- a/
sound/soc/sh/fsi.c
+++ b/
sound/soc/sh/fsi.c
@@
-1631,8
+1631,8
@@
static void fsi_handler_init(struct fsi_priv *fsi)
fsi->capture.priv = fsi;
if (fsi->info->tx_id) {
fsi->capture.priv = fsi;
if (fsi->info->tx_id) {
- fsi->playback.slave.s
lave_id
= fsi->info->tx_id;
- fsi->playback.handler
= &fsi_dma_push_handler;
+ fsi->playback.slave.s
hdma_slave.slave_id
= fsi->info->tx_id;
+ fsi->playback.handler = &fsi_dma_push_handler;
}
}
}
}
This page took
0.024607 seconds
and
5
git commands to generate.