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
c8980d2c
Commit
c8980d2c
authored
Jan 11, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus
parents
d672e98b
24338722
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
sound/soc/codecs/wm5110.c
sound/soc/codecs/wm5110.c
+3
-5
No files found.
sound/soc/codecs/wm5110.c
View file @
c8980d2c
...
@@ -360,15 +360,13 @@ static int wm5110_hp_ev(struct snd_soc_dapm_widget *w,
...
@@ -360,15 +360,13 @@ static int wm5110_hp_ev(struct snd_soc_dapm_widget *w,
static
int
wm5110_clear_pga_volume
(
struct
arizona
*
arizona
,
int
output
)
static
int
wm5110_clear_pga_volume
(
struct
arizona
*
arizona
,
int
output
)
{
{
struct
reg_sequence
clear_pga
=
{
unsigned
int
reg
=
ARIZONA_OUTPUT_PATH_CONFIG_1L
+
output
*
4
;
ARIZONA_OUTPUT_PATH_CONFIG_1L
+
output
*
4
,
0x80
};
int
ret
;
int
ret
;
ret
=
regmap_
multi_reg_write_bypassed
(
arizona
->
regmap
,
&
clear_pga
,
1
);
ret
=
regmap_
write
(
arizona
->
regmap
,
reg
,
0x80
);
if
(
ret
)
if
(
ret
)
dev_err
(
arizona
->
dev
,
"Failed to clear PGA (0x%x): %d
\n
"
,
dev_err
(
arizona
->
dev
,
"Failed to clear PGA (0x%x): %d
\n
"
,
clear_pga
.
reg
,
ret
);
reg
,
ret
);
return
ret
;
return
ret
;
}
}
...
...
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