From 214044b44ae674d9e3dbe4774ed4b91a53d4e07f Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Sun, 8 Aug 2010 20:05:23 +0300 Subject: [PATCH] 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 Cc: Carlos Eduardo Aguiar Signed-off-by: Samuel Ortiz --- drivers/mfd/menelaus.c | 4 ++-- 1 file 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;