mmc: avoid getting CID on SDIO-only cards
authorDavid Vrabel <david.vrabel@csr.com>
Thu, 9 Sep 2010 23:37:24 +0000 (16:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Sep 2010 01:57:22 +0000 (18:57 -0700)
commitf3c65b2870f2481f3646bc410a58a12989ecc704
treeef33d62ee503a43645aae49119a94dc0339fe4b0
parent152831be91dfe864e06c3b3ff2bf994e04df4cdf
mmc: avoid getting CID on SDIO-only cards

The introduction of support for SD combo cards breaks the initialization
of all CSR SDIO chips.  The GO_IDLE (CMD0) in mmc_sd_get_cid() causes CSR
chips to be reset (this is non-standard behavior).

When initializing an SDIO card check for a combo card by using the memory
present bit in the R4 response to IO_SEND_OP_COND (CMD5).  This avoids the
call to mmc_sd_get_cid() on an SDIO-only card.

Signed-off-by: David Vrabel <david.vrabel@csr.com>
Acked-by: Michal Mirolaw <mirq-linux@rere.qmqm.pl>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/mmc/core/sdio.c
include/linux/mmc/sdio.h