summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/menelaus.c
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-08-08 19:05:23 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2010-08-12 11:28:10 +0200
commit214044b44ae674d9e3dbe4774ed4b91a53d4e07f (patch)
treecf81d3cb9f6e6f1774ed3392daa358acf72da760 /drivers/mfd/menelaus.c
parentmfd: Missing slab.h includes (diff)
downloadlinux-214044b44ae674d9e3dbe4774ed4b91a53d4e07f.tar.xz
linux-214044b44ae674d9e3dbe4774ed4b91a53d4e07f.zip
mfd: Fix menelaus mmc slot 2 misconfiguration
We are modifying register value instead of return value. This fix is originally done by Carlos Eduardo Aguiar. Original fix is commit bb4e91722e29efe31587d2cc664b6def645aecd9 in git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git Author modified the fix for mainline version of menelaus. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Cc: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/menelaus.c')
-rw-r--r--drivers/mfd/menelaus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index a3fb4bcb9889..e02b57423ac4 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -356,9 +356,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;