From e5850692172f5c8496b78be13ec182e50875e122 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Tue, 12 Apr 2011 19:31:05 +0200
Subject: [PATCH] --- yaml --- r: 248289 b: refs/heads/master c:
 621206b76825f24ccb650b9f59c18c17f6760a4c h: refs/heads/master i:   248287:
 f42bb4e9c5e3257156ea3029bcf2a51b61296aa4 v: v3

---
 [refs]                           | 2 +-
 trunk/sound/soc/jz4740/qi_lb60.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cc45fa72c268..0f805a1a7fe3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6f0ede7c563497f6d7fef847a965d7fd63d86f9
+refs/heads/master: 621206b76825f24ccb650b9f59c18c17f6760a4c
diff --git a/trunk/sound/soc/jz4740/qi_lb60.c b/trunk/sound/soc/jz4740/qi_lb60.c
index 8c4e84bcc320..c5fc339f68f1 100644
--- a/trunk/sound/soc/jz4740/qi_lb60.c
+++ b/trunk/sound/soc/jz4740/qi_lb60.c
@@ -27,11 +27,7 @@
 static int qi_lb60_spk_event(struct snd_soc_dapm_widget *widget,
 			     struct snd_kcontrol *ctrl, int event)
 {
-	int on = 0;
-	if (event & SND_SOC_DAPM_POST_PMU)
-		on = 1;
-	else if (event & SND_SOC_DAPM_PRE_PMD)
-		on = 0;
+	int on = !SND_SOC_DAPM_EVENT_OFF(event);
 
 	gpio_set_value(QI_LB60_SND_GPIO, on);
 	gpio_set_value(QI_LB60_AMP_GPIO, on);