Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90986dc9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents 474b9c86 862af8ad

sound/soc/soc-dapm.c

+3 −0
Original line number Diff line number Diff line
@@ -981,6 +981,9 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) 
		case SND_SOC_DAPM_STREAM_RESUME:

			sys_power = 1;

			break;

		case SND_SOC_DAPM_STREAM_STOP:

			sys_power = !!codec->active;

			break;

		case SND_SOC_DAPM_STREAM_SUSPEND:

			sys_power = 0;

			break;