From patchwork Wed Aug 11 13:19:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 176792 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Wed, 11 Aug 2010 14:19:38 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OjBDW-0007Oe-26 for chris@printf.net; Wed, 11 Aug 2010 14:19:38 +0100 Received: by mail.laptop.org (Postfix) id 2E594248DA; Wed, 11 Aug 2010 09:19:20 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 23570248D9 for ; Wed, 11 Aug 2010 09:19:20 -0400 (EDT) X-ASG-Debug-ID: 1281532776-0b7413610001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id EG1EH4QE90tjdNdX for ; Wed, 11 Aug 2010 09:19:36 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752631Ab0HKNTb (ORCPT ); Wed, 11 Aug 2010 09:19:31 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:44704 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752412Ab0HKNTa (ORCPT ); Wed, 11 Aug 2010 09:19:30 -0400 Received: by mail-bw0-f46.google.com with SMTP id 3so95750bwz.19 for ; Wed, 11 Aug 2010 06:19:30 -0700 (PDT) Received: by 10.204.156.212 with SMTP id y20mr2414272bkw.179.1281532769959; Wed, 11 Aug 2010 06:19:29 -0700 (PDT) Received: from localhost.localdomain (93-172-40-159.bb.netvision.net.il [93.172.40.159]) by mx.google.com with ESMTPS id x13sm73652bki.12.2010.08.11.06.19.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Aug 2010 06:19:29 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: , Luciano Coelho , , Ido Yariv , San Mehat , Roger Quadros , Nicolas Pitre , Gao Yunpeng , Ohad Ben-Cohen X-ASG-Orig-Subj: [RFC/PATCH 1/6] mmc: sdio: fully reconfigure oldcard on resume Subject: [RFC/PATCH 1/6] mmc: sdio: fully reconfigure oldcard on resume Date: Wed, 11 Aug 2010 16:19:25 +0300 Message-Id: <1281532770-27545-2-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281532770-27545-1-git-send-email-ohad@wizery.com> References: <1281532770-27545-1-git-send-email-ohad@wizery.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1281532776 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.37680 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 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);