projects
/
cascardo
/
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.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[cascardo/linux.git]
/
sound
/
soc
/
davinci
/
davinci-vcif.c
diff --git
a/sound/soc/davinci/davinci-vcif.c
b/sound/soc/davinci/davinci-vcif.c
index
13e05a3
..
9259f1f
100644
(file)
--- a/
sound/soc/davinci/davinci-vcif.c
+++ b/
sound/soc/davinci/davinci-vcif.c
@@
-205,7
+205,7
@@
static struct snd_soc_dai_driver davinci_vcif_dai = {
static int davinci_vcif_probe(struct platform_device *pdev)
{
- struct davinci_vc *davinci_vc =
mfd_get_data(pdev)
;
+ struct davinci_vc *davinci_vc =
pdev->dev.platform_data
;
struct davinci_vcif_dev *davinci_vcif_dev;
int ret;