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
758fc06d
Commit
758fc06d
authored
Mar 25, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
parents
b098d672
017d9491
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
sound/soc/soc-pcm.c
sound/soc/soc-pcm.c
+0
-3
No files found.
sound/soc/soc-pcm.c
View file @
758fc06d
...
@@ -1989,7 +1989,6 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card)
...
@@ -1989,7 +1989,6 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card)
paths
=
dpcm_path_get
(
fe
,
SNDRV_PCM_STREAM_PLAYBACK
,
&
list
);
paths
=
dpcm_path_get
(
fe
,
SNDRV_PCM_STREAM_PLAYBACK
,
&
list
);
if
(
paths
<
0
)
{
if
(
paths
<
0
)
{
dpcm_path_put
(
&
list
);
dev_warn
(
fe
->
dev
,
"ASoC: %s no valid %s path
\n
"
,
dev_warn
(
fe
->
dev
,
"ASoC: %s no valid %s path
\n
"
,
fe
->
dai_link
->
name
,
"playback"
);
fe
->
dai_link
->
name
,
"playback"
);
mutex_unlock
(
&
card
->
mutex
);
mutex_unlock
(
&
card
->
mutex
);
...
@@ -2019,7 +2018,6 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card)
...
@@ -2019,7 +2018,6 @@ int soc_dpcm_runtime_update(struct snd_soc_card *card)
paths
=
dpcm_path_get
(
fe
,
SNDRV_PCM_STREAM_CAPTURE
,
&
list
);
paths
=
dpcm_path_get
(
fe
,
SNDRV_PCM_STREAM_CAPTURE
,
&
list
);
if
(
paths
<
0
)
{
if
(
paths
<
0
)
{
dpcm_path_put
(
&
list
);
dev_warn
(
fe
->
dev
,
"ASoC: %s no valid %s path
\n
"
,
dev_warn
(
fe
->
dev
,
"ASoC: %s no valid %s path
\n
"
,
fe
->
dai_link
->
name
,
"capture"
);
fe
->
dai_link
->
name
,
"capture"
);
mutex_unlock
(
&
card
->
mutex
);
mutex_unlock
(
&
card
->
mutex
);
...
@@ -2084,7 +2082,6 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)
...
@@ -2084,7 +2082,6 @@ static int dpcm_fe_dai_open(struct snd_pcm_substream *fe_substream)
fe
->
dpcm
[
stream
].
runtime
=
fe_substream
->
runtime
;
fe
->
dpcm
[
stream
].
runtime
=
fe_substream
->
runtime
;
if
(
dpcm_path_get
(
fe
,
stream
,
&
list
)
<=
0
)
{
if
(
dpcm_path_get
(
fe
,
stream
,
&
list
)
<=
0
)
{
dpcm_path_put
(
&
list
);
dev_dbg
(
fe
->
dev
,
"ASoC: %s no valid %s route
\n
"
,
dev_dbg
(
fe
->
dev
,
"ASoC: %s no valid %s route
\n
"
,
fe
->
dai_link
->
name
,
stream
?
"capture"
:
"playback"
);
fe
->
dai_link
->
name
,
stream
?
"capture"
:
"playback"
);
}
}
...
...
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