OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[uclinux-h8/linux.git]
/
sound
/
soc
/
codecs
/
sirf-audio-codec.c
diff --git
a/sound/soc/codecs/sirf-audio-codec.c
b/sound/soc/codecs/sirf-audio-codec.c
index
0a8e43c
..
29cb442
100644
(file)
--- a/
sound/soc/codecs/sirf-audio-codec.c
+++ b/
sound/soc/codecs/sirf-audio-codec.c
@@
-395,7
+395,7
@@
struct snd_soc_dai_driver sirf_audio_codec_dai = {
static int sirf_audio_codec_probe(struct snd_soc_codec *codec)
{
- struct snd_soc_dapm_context *dapm =
&codec->dapm
;
+ struct snd_soc_dapm_context *dapm =
snd_soc_codec_get_dapm(codec)
;
pm_runtime_enable(codec->dev);