Merge branch 'for-2.6.32' into for-2.6.33
This commit is contained in:
commit
3da8e6885e
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue