Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
7116f452
Commit
7116f452
authored
Dec 29, 2010
by
Mark Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASoC: Yet more x86 tracepoint workarounds
Signed-off-by:
Mark Brown
<
broonie@opensource.wolfsonmicro.com
>
parent
22a756ee
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
sound/soc/codecs/88pm860x-codec.c
sound/soc/codecs/88pm860x-codec.c
+1
-1
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8350.c
+2
-0
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+4
-0
No files found.
sound/soc/codecs/88pm860x-codec.c
View file @
7116f452
...
...
@@ -1262,7 +1262,7 @@ static irqreturn_t pm860x_codec_handler(int irq, void *data)
mask
=
pm860x
->
det
.
hs_shrt
|
pm860x
->
det
.
hook_det
|
pm860x
->
det
.
lo_shrt
|
pm860x
->
det
.
hp_det
;
#ifndef CONFIG_SND_SOC_88PM860X
#ifndef CONFIG_SND_SOC_88PM860X
_MODULE
if
(
status
&
(
HEADSET_STATUS
|
MIC_STATUS
|
SHORT_HS1
|
SHORT_HS2
|
SHORT_LO1
|
SHORT_LO2
))
trace_snd_soc_jack_irq
(
dev_name
(
pm860x
->
codec
->
dev
));
...
...
sound/soc/codecs/wm8350.c
View file @
7116f452
...
...
@@ -1463,7 +1463,9 @@ static irqreturn_t wm8350_mic_handler(int irq, void *data)
u16
reg
;
int
report
=
0
;
#ifndef CONFIG_SND_SOC_WM8350_MODULE
trace_snd_soc_jack_irq
(
"WM8350 mic"
);
#endif
reg
=
wm8350_reg_read
(
wm8350
,
WM8350_JACK_PIN_STATUS
);
if
(
reg
&
WM8350_JACK_MICSCD_LVL
)
...
...
sound/soc/codecs/wm8994.c
View file @
7116f452
...
...
@@ -2756,7 +2756,9 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data)
int
reg
;
int
report
;
#ifndef CONFIG_SND_SOC_WM8994_MODULE
trace_snd_soc_jack_irq
(
dev_name
(
codec
->
dev
));
#endif
reg
=
snd_soc_read
(
codec
,
WM8994_INTERRUPT_RAW_STATUS_2
);
if
(
reg
<
0
)
{
...
...
@@ -2904,7 +2906,9 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
goto
out
;
}
#ifndef CONFIG_SND_SOC_WM8994_MODULE
trace_snd_soc_jack_irq
(
dev_name
(
codec
->
dev
));
#endif
if
(
wm8994
->
jack_cb
)
wm8994
->
jack_cb
(
reg
,
wm8994
->
jack_cb_data
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment