]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
OMAP: MENELAUS: MMC slot 2 misconfiguration on menelaus code
authorCarlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Fri, 25 Jan 2008 18:36:48 +0000 (14:36 -0400)
committerTony Lindgren <tony@atomide.com>
Fri, 25 Jan 2008 22:55:10 +0000 (14:55 -0800)
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>
drivers/i2c/chips/menelaus.c

index 9d759644ae0193c277599e2088a015b49cf3d957..77b3342c78ceb4b7d4b3d7524cf3b5fc68e9d3e8 100644 (file)
@@ -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;