linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarkko Nikula <jhnikula@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: linux-omap@vger.kernel.org, Samuel Ortiz <sameo@linux.intel.com>,
	Jarkko Nikula <jhnikula@gmail.com>,
	Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Subject: [PATCH 1/2] mfd: menelaus: Fix mmc slot 2 misconfiguration
Date: Sun,  8 Aug 2010 20:05:23 +0300	[thread overview]
Message-ID: <1281287124-26693-1-git-send-email-jhnikula@gmail.com> (raw)

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>
---
Tested on N810. Integrated eMMC on N810 started to work with this patch.
---
 drivers/mfd/menelaus.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index a3fb4bc..e02b574 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;
-- 
1.7.1

             reply	other threads:[~2010-08-08 17:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-08 17:05 Jarkko Nikula [this message]
2010-08-08 17:05 ` [PATCH 2/2] mfd: menelaus: Use macros instead of some constant magic numbers Jarkko Nikula
2010-08-08 21:50   ` Samuel Ortiz
2010-08-08 21:50 ` [PATCH 1/2] mfd: menelaus: Fix mmc slot 2 misconfiguration Samuel Ortiz
2010-08-09  7:31 ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1281287124-26693-1-git-send-email-jhnikula@gmail.com \
    --to=jhnikula@gmail.com \
    --cc=carlos.aguiar@indt.org.br \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).