diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-18 20:55:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-18 20:55:15 -0500 |
| commit | 59af0a0b5848caf38f1bf7013905c3e9cdba4d1d (patch) | |
| tree | 485484cd9c58631a06f5a2f07abc6db4c2bc6f2f /drivers/mmc/card/block.c | |
| parent | f04b30de3c82528f1ab4c58b3dd4c975f5341901 (diff) | |
| parent | 3ebf74b1de9f94da4291db3ea1ae11c5bedb5784 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
omap_hsmmc: Change while(); loops with finite version
omap_hsmmc: recover from transfer failures
omap_hsmmc: only MMC1 allows HCTL.SDVS != 1.8V
omap_hsmmc: card detect irq bugfix
sdhci: fix led naming
mmc_test: fix basic read test
s3cmci: Fix hangup in do_pio_write()
Revert "sdhci: force high speed capability on some controllers"
MMC: fix bug - SDHC card capacity not correct
Diffstat (limited to 'drivers/mmc/card/block.c')
| -rw-r--r-- | drivers/mmc/card/block.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 45b1f430685f..513eb09a638f 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
| @@ -584,7 +584,7 @@ static int mmc_blk_probe(struct mmc_card *card) | |||
| 584 | if (err) | 584 | if (err) |
| 585 | goto out; | 585 | goto out; |
| 586 | 586 | ||
| 587 | string_get_size(get_capacity(md->disk) << 9, STRING_UNITS_2, | 587 | string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2, |
| 588 | cap_str, sizeof(cap_str)); | 588 | cap_str, sizeof(cap_str)); |
| 589 | printk(KERN_INFO "%s: %s %s %s %s\n", | 589 | printk(KERN_INFO "%s: %s %s %s %s\n", |
| 590 | md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), | 590 | md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), |