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
0d911262
Commit
0d911262
authored
Jul 24, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
parents
9b876c99
a5d5639f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
include/sound/soc-dapm.h
include/sound/soc-dapm.h
+3
-0
sound/soc/soc-dapm.c
sound/soc/soc-dapm.c
+1
-0
No files found.
include/sound/soc-dapm.h
View file @
0d911262
...
@@ -382,6 +382,9 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
...
@@ -382,6 +382,9 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
int
snd_soc_dapm_new_controls
(
struct
snd_soc_dapm_context
*
dapm
,
int
snd_soc_dapm_new_controls
(
struct
snd_soc_dapm_context
*
dapm
,
const
struct
snd_soc_dapm_widget
*
widget
,
const
struct
snd_soc_dapm_widget
*
widget
,
int
num
);
int
num
);
struct
snd_soc_dapm_widget
*
snd_soc_dapm_new_control
(
struct
snd_soc_dapm_context
*
dapm
,
const
struct
snd_soc_dapm_widget
*
widget
);
int
snd_soc_dapm_new_dai_widgets
(
struct
snd_soc_dapm_context
*
dapm
,
int
snd_soc_dapm_new_dai_widgets
(
struct
snd_soc_dapm_context
*
dapm
,
struct
snd_soc_dai
*
dai
);
struct
snd_soc_dai
*
dai
);
int
snd_soc_dapm_link_dai_widgets
(
struct
snd_soc_card
*
card
);
int
snd_soc_dapm_link_dai_widgets
(
struct
snd_soc_card
*
card
);
...
...
sound/soc/soc-dapm.c
View file @
0d911262
...
@@ -3282,6 +3282,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
...
@@ -3282,6 +3282,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
mutex_unlock
(
&
dapm
->
card
->
dapm_mutex
);
mutex_unlock
(
&
dapm
->
card
->
dapm_mutex
);
return
w
;
return
w
;
}
}
EXPORT_SYMBOL_GPL
(
snd_soc_dapm_new_control
);
struct
snd_soc_dapm_widget
*
struct
snd_soc_dapm_widget
*
snd_soc_dapm_new_control_unlocked
(
struct
snd_soc_dapm_context
*
dapm
,
snd_soc_dapm_new_control_unlocked
(
struct
snd_soc_dapm_context
*
dapm
,
...
...
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