From patchwork Wed Aug 18 20:36:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 177122 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, 18 Aug 2010 21:36:27 +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 1OlpN5-0007MX-Ko for chris@printf.net; Wed, 18 Aug 2010 21:36:27 +0100 Received: by mail.laptop.org (Postfix) id 3982F24806; Wed, 18 Aug 2010 16:36:09 -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 2946224805 for ; Wed, 18 Aug 2010 16:36:09 -0400 (EDT) X-ASG-Debug-ID: 1282163785-0b7464660001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id O3XLgHa57CsSiwMN for ; Wed, 18 Aug 2010 16:36:25 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753882Ab0HRUgY (ORCPT ); Wed, 18 Aug 2010 16:36:24 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:44276 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753277Ab0HRUgX (ORCPT ); Wed, 18 Aug 2010 16:36:23 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o7IKaAMO026444 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 18 Aug 2010 13:36:11 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o7IKa9R8010886; Wed, 18 Aug 2010 13:36:10 -0700 Message-Id: <201008182036.o7IKa9R8010886@imap1.linux-foundation.org> X-ASG-Orig-Subj: + mmc-avoid-getting-cid-on-sdio-only-cards.patch added to -mm tree Subject: + mmc-avoid-getting-cid-on-sdio-only-cards.patch added to -mm tree To: mm-commits@vger.kernel.org Cc: david.vrabel@csr.com, linux-mmc@vger.kernel.org, mirq-linux@rere.qmqm.pl From: akpm@linux-foundation.org Date: Wed, 18 Aug 2010 13:36:09 -0700 X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 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: 1282163785 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=NO_REAL_NAME X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.38351 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 NO_REAL_NAME From: does not include a real name diff -puN drivers/mmc/core/sdio.c~mmc-avoid-getting-cid-on-sdio-only-cards drivers/mmc/core/sdio.c --- a/drivers/mmc/core/sdio.c~mmc-avoid-getting-cid-on-sdio-only-cards +++ a/drivers/mmc/core/sdio.c @@ -362,11 +362,13 @@ static int mmc_sdio_init_card(struct mmc goto err; } - err = mmc_sd_get_cid(host, host->ocr & ocr, card->raw_cid); - - if (!err) { + if (ocr & R4_MEMORY_PRESENT) { card->type = MMC_TYPE_SD_COMBO; + err = mmc_sd_get_cid(host, host->ocr & ocr, card->raw_cid); + if (err) + goto remove; + if (oldcard && (oldcard->type != MMC_TYPE_SD_COMBO || memcmp(card->raw_cid, oldcard->raw_cid, sizeof(card->raw_cid)) != 0)) { mmc_remove_card(card); diff -puN include/linux/mmc/sdio.h~mmc-avoid-getting-cid-on-sdio-only-cards include/linux/mmc/sdio.h --- a/include/linux/mmc/sdio.h~mmc-avoid-getting-cid-on-sdio-only-cards +++ a/include/linux/mmc/sdio.h @@ -38,6 +38,8 @@ * [8:0] Byte/block count */ +#define R4_MEMORY_PRESENT (1 << 27) + /* SDIO status in R5 Type