aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-08-09 18:43:20 +0000
committerMichael Büsch <mb@bu3sch.de>2010-08-09 18:43:20 +0000
commit27a297eecedf6ab62ee7c7f8b60327ae2d2898bf (patch)
tree2b2e33977c3a21dce74a97915f5d0187dfa521b2 /target/linux
parent79caead3e3feaee39dc067f490585e4868ce5db5 (diff)
downloadupstream-27a297eecedf6ab62ee7c7f8b60327ae2d2898bf.tar.gz
upstream-27a297eecedf6ab62ee7c7f8b60327ae2d2898bf.tar.bz2
upstream-27a297eecedf6ab62ee7c7f8b60327ae2d2898bf.zip
omap24xx: Fix MMC multiplexer
SVN-Revision: 22563
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/omap24xx/patches-2.6.35/811-mmc-multiplexer-fixes.patch18
1 files changed, 18 insertions, 0 deletions
diff --git 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
new file mode 100644
index 0000000000..37082b875d
--- /dev/null
+++ 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;