diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-27 02:03:03 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-27 02:03:03 -0400 |
| commit | cf73df1e2975ae8f88e573e5f593761339a65def (patch) | |
| tree | 1c264fb62e9bb36af8e762e860a6de3daf112782 /sound/soc/soc-dapm.c | |
| parent | d1227e3fe0c63a258db855f4f1536b0b34cd8725 (diff) | |
| parent | ea77b94774b3cc67162d74894b49af7eb17071f0 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 456617e63789..999bb08cdfb1 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
| @@ -1110,7 +1110,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) | |||
| 1110 | trace_snd_soc_dapm_start(card); | 1110 | trace_snd_soc_dapm_start(card); |
| 1111 | 1111 | ||
| 1112 | list_for_each_entry(d, &card->dapm_list, list) | 1112 | list_for_each_entry(d, &card->dapm_list, list) |
| 1113 | if (d->n_widgets) | 1113 | if (d->n_widgets || d->codec == NULL) |
| 1114 | d->dev_power = 0; | 1114 | d->dev_power = 0; |
| 1115 | 1115 | ||
| 1116 | /* Check which widgets we need to power and store them in | 1116 | /* Check which widgets we need to power and store them in |