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

Commit 97cef585 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.32' into for-2.6.33

parents dcdec639 50b6bce5

sound/soc/soc-dapm.c

+17 −3
Original line number Diff line number Diff line
@@ -977,9 +977,19 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) 
			if (!w->power_check)

				continue;



			/* If we're suspending then pull down all the 

			 * power. */

			switch (event) {

			case SND_SOC_DAPM_STREAM_SUSPEND:

				power = 0;

				break;



			default:

				power = w->power_check(w);

				if (power)

					sys_power = 1;

				break;

			}



			if (w->power == power)

				continue;
@@ -1003,8 +1013,12 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) 
		case SND_SOC_DAPM_STREAM_RESUME:

			sys_power = 1;

			break;

		case SND_SOC_DAPM_STREAM_SUSPEND:

			sys_power = 0;

			break;

		case SND_SOC_DAPM_STREAM_NOP:

			sys_power = codec->bias_level != SND_SOC_BIAS_STANDBY;

			break;

		default:

			break;

		}