27a297eece
SVN-Revision: 22563
18 lines
428 B
Diff
18 lines
428 B
Diff
---
|
|
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;
|