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
977011ea
Commit
977011ea
authored
Mar 13, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
parents
e87fb3b1
513cb311
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
sound/soc/soc-core.c
sound/soc/soc-core.c
+4
-4
No files found.
sound/soc/soc-core.c
View file @
977011ea
...
...
@@ -986,16 +986,16 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
dev_dbg
(
card
->
dev
,
"ASoC: binding %s
\n
"
,
dai_link
->
name
);
rtd
=
soc_new_pcm_runtime
(
card
,
dai_link
);
if
(
!
rtd
)
return
-
ENOMEM
;
if
(
soc_is_dai_link_bound
(
card
,
dai_link
))
{
dev_dbg
(
card
->
dev
,
"ASoC: dai link %s already bound
\n
"
,
dai_link
->
name
);
return
0
;
}
rtd
=
soc_new_pcm_runtime
(
card
,
dai_link
);
if
(
!
rtd
)
return
-
ENOMEM
;
cpu_dai_component
.
name
=
dai_link
->
cpu_name
;
cpu_dai_component
.
of_node
=
dai_link
->
cpu_of_node
;
cpu_dai_component
.
dai_name
=
dai_link
->
cpu_dai_name
;
...
...
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