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
64fdf13c
Commit
64fdf13c
authored
Oct 06, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
parents
97c53e26
5dc0158a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
include/sound/soc-dapm.h
include/sound/soc-dapm.h
+1
-0
sound/soc/soc-dapm.c
sound/soc/soc-dapm.c
+2
-1
No files found.
include/sound/soc-dapm.h
View file @
64fdf13c
...
@@ -432,6 +432,7 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,
...
@@ -432,6 +432,7 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,
int
snd_soc_dapm_ignore_suspend
(
struct
snd_soc_dapm_context
*
dapm
,
int
snd_soc_dapm_ignore_suspend
(
struct
snd_soc_dapm_context
*
dapm
,
const
char
*
pin
);
const
char
*
pin
);
void
snd_soc_dapm_auto_nc_pins
(
struct
snd_soc_card
*
card
);
void
snd_soc_dapm_auto_nc_pins
(
struct
snd_soc_card
*
card
);
unsigned
int
dapm_kcontrol_get_value
(
const
struct
snd_kcontrol
*
kcontrol
);
/* Mostly internal - should not normally be used */
/* Mostly internal - should not normally be used */
void
dapm_mark_io_dirty
(
struct
snd_soc_dapm_context
*
dapm
);
void
dapm_mark_io_dirty
(
struct
snd_soc_dapm_context
*
dapm
);
...
...
sound/soc/soc-dapm.c
View file @
64fdf13c
...
@@ -326,12 +326,13 @@ static struct list_head *dapm_kcontrol_get_path_list(
...
@@ -326,12 +326,13 @@ static struct list_head *dapm_kcontrol_get_path_list(
list_for_each_entry(path, dapm_kcontrol_get_path_list(kcontrol), \
list_for_each_entry(path, dapm_kcontrol_get_path_list(kcontrol), \
list_kcontrol)
list_kcontrol)
static
unsigned
int
dapm_kcontrol_get_value
(
const
struct
snd_kcontrol
*
kcontrol
)
unsigned
int
dapm_kcontrol_get_value
(
const
struct
snd_kcontrol
*
kcontrol
)
{
{
struct
dapm_kcontrol_data
*
data
=
snd_kcontrol_chip
(
kcontrol
);
struct
dapm_kcontrol_data
*
data
=
snd_kcontrol_chip
(
kcontrol
);
return
data
->
value
;
return
data
->
value
;
}
}
EXPORT_SYMBOL_GPL
(
dapm_kcontrol_get_value
);
static
bool
dapm_kcontrol_set_value
(
const
struct
snd_kcontrol
*
kcontrol
,
static
bool
dapm_kcontrol_set_value
(
const
struct
snd_kcontrol
*
kcontrol
,
unsigned
int
value
)
unsigned
int
value
)
...
...
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