diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:08:07 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:08:07 -0400 |
commit | 51a730d758ae4052e10ca7e06336f10af598c4fc (patch) | |
tree | b76a004c00cd7139659be515ee03398e47067290 /drivers/mmc/mmc_block.c | |
parent | 6cd15a9daf826115356f9403494c76e5aafa7793 (diff) | |
parent | ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (diff) |
Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
Diffstat (limited to 'drivers/mmc/mmc_block.c')
-rw-r--r-- | drivers/mmc/mmc_block.c | 5 |
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) struct mmc_blk_data *md; int err; - if (card->csd.cmdclass & ~0x1ff) + /* + * Check that the card supports the command class(es) we need. + */ + if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; if (card->csd.read_blkbits < 9) { |