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
97cef585
Commit
97cef585
authored
Nov 23, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.32' into for-2.6.33
parents
dcdec639
50b6bce5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
3 deletions
+17
-3
sound/soc/soc-dapm.c
sound/soc/soc-dapm.c
+17
-3
No files found.
sound/soc/soc-dapm.c
View file @
97cef585
...
@@ -977,9 +977,19 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
...
@@ -977,9 +977,19 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
if
(
!
w
->
power_check
)
if
(
!
w
->
power_check
)
continue
;
continue
;
/* If we're suspending then pull down all the
* power. */
switch
(
event
)
{
case
SND_SOC_DAPM_STREAM_SUSPEND
:
power
=
0
;
break
;
default:
power
=
w
->
power_check
(
w
);
power
=
w
->
power_check
(
w
);
if
(
power
)
if
(
power
)
sys_power
=
1
;
sys_power
=
1
;
break
;
}
if
(
w
->
power
==
power
)
if
(
w
->
power
==
power
)
continue
;
continue
;
...
@@ -1003,8 +1013,12 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
...
@@ -1003,8 +1013,12 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
case
SND_SOC_DAPM_STREAM_RESUME
:
case
SND_SOC_DAPM_STREAM_RESUME
:
sys_power
=
1
;
sys_power
=
1
;
break
;
break
;
case
SND_SOC_DAPM_STREAM_SUSPEND
:
sys_power
=
0
;
break
;
case
SND_SOC_DAPM_STREAM_NOP
:
case
SND_SOC_DAPM_STREAM_NOP
:
sys_power
=
codec
->
bias_level
!=
SND_SOC_BIAS_STANDBY
;
sys_power
=
codec
->
bias_level
!=
SND_SOC_BIAS_STANDBY
;
break
;
default:
default:
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