Commit 3da8e688 authored by Mark Brown's avatar Mark Brown

Merge branch 'for-2.6.32' into for-2.6.33

parents c8bf93f0 8e8b2d67
......@@ -2135,9 +2135,9 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
}
}
}
mutex_unlock(&codec->mutex);
dapm_power_widgets(codec, event);
mutex_unlock(&codec->mutex);
dump_dapm(codec, __func__);
return 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment