projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/msm8916', 'asoc/topic/mtk', 'asoc/topic...
[linux-2.6-microblaze.git]
/
sound
/
soc
/
generic
/
simple-card.c
diff --git
a/sound/soc/generic/simple-card.c
b/sound/soc/generic/simple-card.c
index
8b7b472
..
dfaf48f
100644
(file)
--- a/
sound/soc/generic/simple-card.c
+++ b/
sound/soc/generic/simple-card.c
@@
-202,7
+202,7
@@
static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
if (ret < 0)
return ret;
- ret = asoc_simple_card_init_mic(rtd->card, &priv->
hp
_jack, PREFIX);
+ ret = asoc_simple_card_init_mic(rtd->card, &priv->
mic
_jack, PREFIX);
if (ret < 0)
return ret;