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
b9fb7299
Commit
b9fb7299
authored
Oct 08, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
parents
7b8ab38e
5e63dfcc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
sound/soc/soc-core.c
sound/soc/soc-core.c
+2
-2
sound/soc/soc-pcm.c
sound/soc/soc-pcm.c
+1
-1
No files found.
sound/soc/soc-core.c
View file @
b9fb7299
...
@@ -4192,10 +4192,10 @@ void snd_soc_remove_platform(struct snd_soc_platform *platform)
...
@@ -4192,10 +4192,10 @@ void snd_soc_remove_platform(struct snd_soc_platform *platform)
snd_soc_component_del_unlocked
(
&
platform
->
component
);
snd_soc_component_del_unlocked
(
&
platform
->
component
);
mutex_unlock
(
&
client_mutex
);
mutex_unlock
(
&
client_mutex
);
snd_soc_component_cleanup
(
&
platform
->
component
);
dev_dbg
(
platform
->
dev
,
"ASoC: Unregistered platform '%s'
\n
"
,
dev_dbg
(
platform
->
dev
,
"ASoC: Unregistered platform '%s'
\n
"
,
platform
->
component
.
name
);
platform
->
component
.
name
);
snd_soc_component_cleanup
(
&
platform
->
component
);
}
}
EXPORT_SYMBOL_GPL
(
snd_soc_remove_platform
);
EXPORT_SYMBOL_GPL
(
snd_soc_remove_platform
);
...
...
sound/soc/soc-pcm.c
View file @
b9fb7299
...
@@ -352,7 +352,7 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream)
...
@@ -352,7 +352,7 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream)
}
else
{
}
else
{
for
(
i
=
0
;
i
<
rtd
->
num_codecs
;
i
++
)
{
for
(
i
=
0
;
i
<
rtd
->
num_codecs
;
i
++
)
{
codec_dai
=
rtd
->
codec_dais
[
i
];
codec_dai
=
rtd
->
codec_dais
[
i
];
if
(
codec_dai
->
driver
->
playback
.
sig_bits
==
0
)
{
if
(
codec_dai
->
driver
->
capture
.
sig_bits
==
0
)
{
bits
=
0
;
bits
=
0
;
break
;
break
;
}
}
...
...
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