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
b12d1e4f
Commit
b12d1e4f
authored
Mar 28, 2018
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/component' into asoc-linus
parents
3eb2ce82
dead99e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
sound/soc/soc-io.c
sound/soc/soc-io.c
+2
-5
No files found.
sound/soc/soc-io.c
View file @
b12d1e4f
...
@@ -88,19 +88,16 @@ static int snd_soc_component_update_bits_legacy(
...
@@ -88,19 +88,16 @@ static int snd_soc_component_update_bits_legacy(
unsigned
int
old
,
new
;
unsigned
int
old
,
new
;
int
ret
;
int
ret
;
if
(
!
component
->
read
||
!
component
->
write
)
return
-
EIO
;
mutex_lock
(
&
component
->
io_mutex
);
mutex_lock
(
&
component
->
io_mutex
);
ret
=
component
->
read
(
component
,
reg
,
&
old
);
ret
=
snd_soc_component_
read
(
component
,
reg
,
&
old
);
if
(
ret
<
0
)
if
(
ret
<
0
)
goto
out_unlock
;
goto
out_unlock
;
new
=
(
old
&
~
mask
)
|
(
val
&
mask
);
new
=
(
old
&
~
mask
)
|
(
val
&
mask
);
*
change
=
old
!=
new
;
*
change
=
old
!=
new
;
if
(
*
change
)
if
(
*
change
)
ret
=
component
->
write
(
component
,
reg
,
new
);
ret
=
snd_soc_component_
write
(
component
,
reg
,
new
);
out_unlock:
out_unlock:
mutex_unlock
(
&
component
->
io_mutex
);
mutex_unlock
(
&
component
->
io_mutex
);
...
...
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