projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus
[linux-2.6-block.git]
/
sound
/
soc
/
sh
/
rcar
/
core.c
diff --git
a/sound/soc/sh/rcar/core.c
b/sound/soc/sh/rcar/core.c
index 1b53605f7154394d1746cb0a692953e296848c2a..110577c523179c3974a2ebe45ef577ea651aa5ce 100644
(file)
--- a/
sound/soc/sh/rcar/core.c
+++ b/
sound/soc/sh/rcar/core.c
@@
-1252,6
+1252,8
@@
static int rsnd_probe(struct platform_device *pdev)
goto exit_snd_probe;
}
+ dev_set_drvdata(dev, priv);
+
/*
* asoc register
*/
@@
-1268,8
+1270,6
@@
static int rsnd_probe(struct platform_device *pdev)
goto exit_snd_soc;
}
- dev_set_drvdata(dev, priv);
-
pm_runtime_enable(dev);
dev_info(dev, "probed\n");