From patchwork Sun Aug 8 17:05:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 118279 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o78H59CA007279 for ; Sun, 8 Aug 2010 17:05:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751682Ab0HHREb (ORCPT ); Sun, 8 Aug 2010 13:04:31 -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 Received: by ewy23 with SMTP id 23so3240086ewy.19 for ; Sun, 08 Aug 2010 10:04:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=i0h7QkZCuUY4OFBw4+SGEPycLUSPTxrnNi13z+Z/Kfo=; b=OMjoIaMPhm/D+uiJoG/mK98llt+AAxrnUE1rFGfaODeYzThCtxpDpbv+NEJ+3M37ng H0B4/ks/gThQvI7XIDTPRlB9y7aE8YJDQ7wvy2cDJ4KupoXxt/ZZpoAOFMaAErS8GYoB LOtlb9vEUFg1kS7IDHfBCUcG/szxKg/fE9O9M= 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= Received: by 10.213.15.82 with SMTP id j18mr11243638eba.1.1281287069128; Sun, 08 Aug 2010 10:04:29 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id a48sm6294549eei.1.2010.08.08.10.04.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 08 Aug 2010 10:04:26 -0700 (PDT) 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-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 08 Aug 2010 17:05:09 +0000 (UTC) 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;