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
14388a69
Commit
14388a69
authored
Aug 15, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
parents
c200d888
fe581391
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
sound/soc/soc-dapm.c
sound/soc/soc-dapm.c
+4
-3
No files found.
sound/soc/soc-dapm.c
View file @
14388a69
...
@@ -679,13 +679,14 @@ static int dapm_new_mux(struct snd_soc_dapm_widget *w)
...
@@ -679,13 +679,14 @@ static int dapm_new_mux(struct snd_soc_dapm_widget *w)
return
-
EINVAL
;
return
-
EINVAL
;
}
}
path
=
list_first_entry
(
&
w
->
sources
,
struct
snd_soc_dapm_path
,
if
(
list_empty
(
&
w
->
sources
))
{
list_sink
);
if
(
!
path
)
{
dev_err
(
dapm
->
dev
,
"ASoC: mux %s has no paths
\n
"
,
w
->
name
);
dev_err
(
dapm
->
dev
,
"ASoC: mux %s has no paths
\n
"
,
w
->
name
);
return
-
EINVAL
;
return
-
EINVAL
;
}
}
path
=
list_first_entry
(
&
w
->
sources
,
struct
snd_soc_dapm_path
,
list_sink
);
ret
=
dapm_create_or_share_mixmux_kcontrol
(
w
,
0
,
path
);
ret
=
dapm_create_or_share_mixmux_kcontrol
(
w
,
0
,
path
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
...
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