From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Date: Fri, 25 Jan 2008 18:36:48 +0000 (-0400)
Subject: OMAP: MENELAUS: MMC slot 2 misconfiguration on menelaus code
X-Git-Tag: v2.6.24-omap1~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bb4e91722e29efe31587d2cc664b6def645aecd9;p=linux-2.6-omap-h63xx.git

OMAP: MENELAUS: MMC slot 2 misconfiguration on menelaus code

This patch corrects MMC slot 2 misconfiguration on menelaus code.

Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Acked-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index 9d759644ae0..77b3342c78c 100644
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -357,9 +357,9 @@ int menelaus_set_mmc_slot(int slot, int enable, int power, int cd_en)
 		int b;
 
 		if (enable)
-			ret |= 1 << 1;
+			val |= 1 << 1;
 		else
-			ret &= ~(1 << 1);
+			val &= ~(1 << 1);
 		b = menelaus_read_reg(MENELAUS_MCT_CTRL2);
 		b &= ~0x03;
 		b |= power;