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
Kirill Smelkov
linux
Commits
39a329b1
Commit
39a329b1
authored
Dec 02, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next
parents
54fc5a1a
5851e9b8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8350.c
+1
-3
No files found.
sound/soc/codecs/wm8350.c
View file @
39a329b1
...
...
@@ -1500,7 +1500,7 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
supply_names
);
i
++
)
priv
->
supplies
[
i
].
supply
=
supply_names
[
i
];
ret
=
regulator_bulk_get
(
wm8350
->
dev
,
ARRAY_SIZE
(
priv
->
supplies
),
ret
=
devm_
regulator_bulk_get
(
wm8350
->
dev
,
ARRAY_SIZE
(
priv
->
supplies
),
priv
->
supplies
);
if
(
ret
!=
0
)
return
ret
;
...
...
@@ -1607,8 +1607,6 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec)
wm8350_clear_bits
(
wm8350
,
WM8350_POWER_MGMT_5
,
WM8350_CODEC_ENA
);
regulator_bulk_free
(
ARRAY_SIZE
(
priv
->
supplies
),
priv
->
supplies
);
return
0
;
}
...
...
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