From patchwork Wed Jul 21 17:33:48 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ohad Ben Cohen <ohad@wizery.com>
X-Patchwork-Id: 113421
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 o6LHZKHN008237
	for <patchwork-omap@patchwork.kernel.org>;
	Wed, 21 Jul 2010 17:35:21 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758737Ab0GURfR (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Wed, 21 Jul 2010 13:35:17 -0400
Received: from mail-bw0-f46.google.com ([209.85.214.46]:59315 "EHLO
	mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758632Ab0GURfN (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Wed, 21 Jul 2010 13:35:13 -0400
Received: by mail-bw0-f46.google.com with SMTP id 1so374531bwz.19
	for <multiple recipients>; Wed, 21 Jul 2010 10:35:12 -0700 (PDT)
Received: by 10.204.59.2 with SMTP id j2mr298577bkh.199.1279733711769;
	Wed, 21 Jul 2010 10:35:11 -0700 (PDT)
Received: from localhost.localdomain (93-172-119-238.bb.netvision.net.il
	[93.172.119.238]) by mx.google.com with ESMTPS id
	f10sm29348743bkl.5.2010.07.21.10.35.08
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Wed, 21 Jul 2010 10:35:11 -0700 (PDT)
From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>,
	<linux-omap@vger.kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>, <linux@arm.linux.org.uk>,
	Chikkature Rajashekar Madhusudhan <madhu.cr@ti.com>,
	Luciano Coelho <luciano.coelho@nokia.com>, <akpm@linux-foundation.org>,
	San Mehat <san@google.com>, Roger Quadros <roger.quadros@nokia.com>,
	Tony Lindgren <tony@atomide.com>, Nicolas Pitre <nico@fluxnic.net>,
	Pandita Vikram <vikram.pandita@ti.com>, Kalle Valo <kalle.valo@iki.fi>,
	Ohad Ben-Cohen <ohad@wizery.com>
Subject: [PATCH v2 14/20] mmc: sdio: fully reconfigure oldcard on resume
Date: Wed, 21 Jul 2010 20:33:48 +0300
Message-Id: <1279733634-21974-15-git-send-email-ohad@wizery.com>
X-Mailer: git-send-email 1.7.0.4
In-Reply-To: <1279733634-21974-1-git-send-email-ohad@wizery.com>
References: <1279733634-21974-1-git-send-email-ohad@wizery.com>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
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]);
	Wed, 21 Jul 2010 17:35:21 +0000 (UTC)


diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index b9dee28..645f173 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -344,7 +344,6 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
 			goto err;
 		}
 		card = oldcard;
-		return 0;
 	}
 
 	/*
@@ -487,9 +486,6 @@ static int mmc_sdio_resume(struct mmc_host *host)
 	mmc_claim_host(host);
 	err = mmc_sdio_init_card(host, host->ocr, host->card,
 				 (host->pm_flags & MMC_PM_KEEP_POWER));
-	if (!err)
-		/* We may have switched to 1-bit mode during suspend. */
-		err = sdio_enable_wide(host->card);
 	if (!err && host->sdio_irqs)
 		mmc_signal_sdio_irq(host);
 	mmc_release_host(host);