omap24xx: Fix MMC multiplexer

SVN-Revision: 22563
2010-08-09 18:43:20 +00:00 · 2010-08-09 18:43:20 +00:00 · 27a297eece
commit 27a297eece
parent 79caead3e3
1 changed files with 18 additions and 0 deletions
--- a/target/linux/omap24xx/patches-2.6.35/811-mmc-multiplexer-fixes.patch
+++ b/target/linux/omap24xx/patches-2.6.35/811-mmc-multiplexer-fixes.patch
@ -0,0 +1,18 @@
+---
+ drivers/mfd/menelaus.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- linux-2.6.35.orig/drivers/mfd/menelaus.c
+++ linux-2.6.35/drivers/mfd/menelaus.c
+@@ -356,9 +356,9 @@ int menelaus_set_mmc_slot(int slot, int
+ 		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;