diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 13:03:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 13:03:24 -0400 |
| commit | 8973a585aec125beb2a3de50bb491004299f53d5 (patch) | |
| tree | 3f069a9c7eff2c916e02427fd9800ce2b55a4a90 /drivers/mmc/mmc_block.c | |
| parent | 907f4678c114a125fe4584758681c31bf3d627da (diff) | |
| parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
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) | |||
| 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) { |