projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af13cbc
)
ASoC: ams-deltea: Register jacks at the card level
author
Lars-Peter Clausen
<
[email protected]
>
Wed, 4 Mar 2015 09:33:25 +0000
(10:33 +0100)
committer
Mark Brown
<
[email protected]
>
Wed, 4 Mar 2015 17:10:26 +0000
(17:10 +0000)
The jacks are card level elements so use snd_soc_card_jack_new() instead of
snd_soc_jack_new() to register them.
Signed-off-by: Lars-Peter Clausen <
[email protected]
>
Signed-off-by: Mark Brown <
[email protected]
>
sound/soc/omap/ams-delta.c
patch
|
blob
|
history
diff --git
a/sound/soc/omap/ams-delta.c
b/sound/soc/omap/ams-delta.c
index 706613077c155e93d7952aab02c49ccfccafaecc..16cc95fa45731b3f9ed6f47896b95b0eadf3a025 100644
(file)
--- a/
sound/soc/omap/ams-delta.c
+++ b/
sound/soc/omap/ams-delta.c
@@
-479,8
+479,8
@@
static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
/* Add hook switch - can be used to control the codec from userspace
* even if line discipline fails */
- ret = snd_soc_
jack_new(rtd->codec, "hook_switch"
,
-
SND_JACK_HEADSET, &ams_delta_hook_switch
);
+ ret = snd_soc_
card_jack_new(card, "hook_switch", SND_JACK_HEADSET
,
+
&ams_delta_hook_switch, NULL, 0
);
if (ret)
dev_warn(card->dev,
"Failed to allocate resources for hook switch, "