Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 193455
b: refs/heads/master
c: 50ae838
h: refs/heads/master
i:
  193453: 29db443
  193451: 141b791
  193447: 95be0f4
  193439: deddd0b
v: v3
  • Loading branch information
Mark Brown committed May 10, 2010
1 parent 93ec19c commit 831b5ba
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 29e189c29d33d273424327ca4c1a74d8cdc04f48
refs/heads/master: 50ae8384cde9a67714ff03010493c5052690624e
1 change: 0 additions & 1 deletion trunk/include/sound/soc-dapm.h
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,6 @@ struct snd_soc_dapm_widget {
unsigned char connected:1; /* connected codec pin */
unsigned char new:1; /* cnew complete */
unsigned char ext:1; /* has external widgets */
unsigned char suspend:1; /* was active before suspend */
unsigned char force:1; /* force state */

int (*power_check)(struct snd_soc_dapm_widget *w);
Expand Down
10 changes: 0 additions & 10 deletions trunk/sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2012,18 +2012,8 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
w->active = 0;
break;
case SND_SOC_DAPM_STREAM_SUSPEND:
if (w->active)
w->suspend = 1;
w->active = 0;
break;
case SND_SOC_DAPM_STREAM_RESUME:
if (w->suspend) {
w->active = 1;
w->suspend = 0;
}
break;
case SND_SOC_DAPM_STREAM_PAUSE_PUSH:
break;
case SND_SOC_DAPM_STREAM_PAUSE_RELEASE:
break;
}
Expand Down

0 comments on commit 831b5ba

Please sign in to comment.