From e4217bf145dfb5e0c22f5f4fb34a303f7998cbac Mon Sep 17 00:00:00 2001
From: Joonyoung Shim <jy0922.shim@samsung.com>
Date: Thu, 23 Jul 2009 17:33:17 +0900
Subject: [PATCH] --- yaml --- r: 157591 b: refs/heads/master c:
 a7569afa8b79ca9272b0d7544335bc05b5b721d6 h: refs/heads/master i:   157589:
 8e887fb41d3fde8ac32e5e19597b79a38d8dc0c1   157587:
 fc591bc3e31a499b352c49e46adba4a434437423   157583:
 1e70f3a4bf3cfc525dd5041bb833200502d4cca3 v: v3

---
 [refs]                           |  2 +-
 trunk/sound/soc/codecs/max9877.c | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ca094810668a..c6b217202a82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 459dc35233c88d9eb7c5d0e6c086122751e64750
+refs/heads/master: a7569afa8b79ca9272b0d7544335bc05b5b721d6
diff --git a/trunk/sound/soc/codecs/max9877.c b/trunk/sound/soc/codecs/max9877.c
index a1f1119e1b7a..9e7e964a5fa3 100644
--- a/trunk/sound/soc/codecs/max9877.c
+++ b/trunk/sound/soc/codecs/max9877.c
@@ -25,7 +25,14 @@ static u8 max9877_regs[5] = { 0x40, 0x00, 0x00, 0x00, 0x49 };
 
 static void max9877_write_regs(void)
 {
-	if (i2c_master_send(i2c, max9877_regs, 5) != 5)
+	unsigned int i;
+	u8 data[6];
+
+	data[0] = MAX9877_INPUT_MODE;
+	for (i = 0; i < ARRAY_SIZE(max9877_regs); i++)
+		data[i + 1] = max9877_regs[i];
+
+	if (i2c_master_send(i2c, data, 6) != 6)
 		dev_err(&i2c->dev, "i2c write failed\n");
 }
 
@@ -135,12 +142,12 @@ static int max9877_set_out_mode(struct snd_kcontrol *kcontrol,
 {
 	u8 value = ucontrol->value.integer.value[0];
 
-	if (value)
-		value += 1;
+	value += 1;
 
 	if ((max9877_regs[MAX9877_OUTPUT_MODE] & MAX9877_OUTMODE_MASK) == value)
 		return 0;
 
+	max9877_regs[MAX9877_OUTPUT_MODE] &= ~MAX9877_OUTMODE_MASK;
 	max9877_regs[MAX9877_OUTPUT_MODE] |= value;
 	max9877_write_regs();
 	return 1;
@@ -166,6 +173,7 @@ static int max9877_set_osc_mode(struct snd_kcontrol *kcontrol,
 	if ((max9877_regs[MAX9877_OUTPUT_MODE] & MAX9877_OSC_MASK) == value)
 		return 0;
 
+	max9877_regs[MAX9877_OUTPUT_MODE] &= ~MAX9877_OSC_MASK;
 	max9877_regs[MAX9877_OUTPUT_MODE] |= value;
 	max9877_write_regs();
 	return 1;