aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-21 18:27:09 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-21 18:27:09 -0400
commit1808caffaf448f0ad42ba04b25825fc170cf8e44 (patch)
tree4b0ecfabefb62c3b8cfcfb7a72041c34e1f7add7 /drivers
parent3d15e4a32dfa3da45751356e5f47aa04b97370e0 (diff)
parent912490db699d83cb3d03570b63df7448677a3f56 (diff)
Merge of master.kernel.org:/home/rmk/linux-2.6-mmc.git
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/mmc_block.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index b5b4a7b11903..d4eee99c2bf6 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -383,7 +383,10 @@ static int mmc_blk_probe(struct mmc_card *card)
383 struct mmc_blk_data *md; 383 struct mmc_blk_data *md;
384 int err; 384 int err;
385 385
386 if (card->csd.cmdclass & ~0x1ff) 386 /*
387 * Check that the card supports the command class(es) we need.
388 */
389 if (!(card->csd.cmdclass & CCC_BLOCK_READ))
387 return -ENODEV; 390 return -ENODEV;
388 391
389 if (card->csd.read_blkbits < 9) { 392 if (card->csd.read_blkbits < 9) {