From patchwork Tue Mar 1 13:41:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 599161 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p21DfpU9028228 for ; Tue, 1 Mar 2011 13:41:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752546Ab1CANlv (ORCPT ); Tue, 1 Mar 2011 08:41:51 -0500 Received: from eu1sys200aog112.obsmtp.com ([207.126.144.133]:40035 "EHLO eu1sys200aog112.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752168Ab1CANlu (ORCPT ); Tue, 1 Mar 2011 08:41:50 -0500 Received: from source ([138.198.100.35]) (using TLSv1) by eu1sys200aob112.postini.com ([207.126.147.11]) with SMTP ID DSNKTWz3lQi08Ux4+RUAroVs3NpcLzTO1w/f@postini.com; Tue, 01 Mar 2011 13:41:49 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id B0D61DD; Tue, 1 Mar 2011 13:41:09 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id E0E7CA1C; Tue, 1 Mar 2011 13:41:08 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 43CE724C2E7; Tue, 1 Mar 2011 14:41:01 +0100 (CET) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.2.254.0; Tue, 1 Mar 2011 14:41:07 +0100 From: Linus Walleij To: , Chris Ball Cc: Lee Jones , Stefan Nilsson XK , Linus Walleij Subject: [PATCH] mmc/sdio: remember new card RCA when redetecting card Date: Tue, 1 Mar 2011 14:41:04 +0100 Message-ID: <1298986864-25597-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.3.2 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 01 Mar 2011 13:41:52 +0000 (UTC) diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 617e9ad..30d065d 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -395,6 +395,13 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, if (err) goto remove; + /* + * Update oldcard with the new RCA received from the + * SDIO device. + */ + if (oldcard) + oldcard->rca = card->rca; + mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL); }