Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752227Ab0HHREc (ORCPT ); Sun, 8 Aug 2010 13:04:32 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:54473 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750712Ab0HHREa (ORCPT ); Sun, 8 Aug 2010 13:04:30 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=uLgie0aucgVaWLEz7g5jw84knTTiqr0NGHfRsCKYYo5seLpZQOb68L7UWvmQJgTBjU hXzvSiyal2bvuQefOCD/+DwcQo1aHDu0yG6aBN7/RRY9zjTCNsipSEJtODEjAOl6ABgi +Q4mYUnWuI2YaltXhLEgyzAvmnJ2peqkIwrFc= From: Jarkko Nikula To: linux-kernel@vger.kernel.org Cc: linux-omap@vger.kernel.org, Samuel Ortiz , Jarkko Nikula , Carlos Eduardo Aguiar Subject: [PATCH 1/2] mfd: menelaus: Fix mmc slot 2 misconfiguration Date: Sun, 8 Aug 2010 20:05:23 +0300 Message-Id: <1281287124-26693-1-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1265 Lines: 40 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/