diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 19:02:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 19:02:04 -0400 |
| commit | 7d69cff26ceadce8638cb65191285932a3de3d4c (patch) | |
| tree | 7a23eb561e6a25fbd111af2d0152cc6f34c2cecd /drivers/mmc | |
| parent | 8fa6f4974d55ad1fb0a9522c5a5cfd050a517048 (diff) | |
| parent | 0351b8f81392c6dbbbb036e5c8f73ceff68726e9 (diff) | |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley:
"This is the usual grab bag of driver updates (lpfc, qla2xxx, storvsc,
aacraid, ipr) plus an assortment of minor updates. There's also a
major update to aic1542 which moves the driver into this millenium"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (106 commits)
change SCSI Maintainer email
sd, mmc, virtio_blk, string_helpers: fix block size units
ufs: add support to allow non standard behaviours (quirks)
ufs-qcom: save controller revision info in internal structure
qla2xxx: Update driver version to 8.07.00.18-k
qla2xxx: Restore physical port WWPN only, when port down detected for FA-WWPN port.
qla2xxx: Fix virtual port configuration, when switch port is disabled/enabled.
qla2xxx: Prevent multiple firmware dump collection for ISP27XX.
qla2xxx: Disable Interrupt handshake for ISP27XX.
qla2xxx: Add debugging info for MBX timeout.
qla2xxx: Add serdes read/write support for ISP27XX
qla2xxx: Add udev notification to save fw dump for ISP27XX
qla2xxx: Add message for sucessful FW dump collected for ISP27XX.
qla2xxx: Add support to load firmware from file for ISP 26XX/27XX.
qla2xxx: Fix beacon blink for ISP27XX.
qla2xxx: Increase the wait time for firmware to be ready for P3P.
qla2xxx: Fix crash due to wrong casting of reg for ISP27XX.
qla2xxx: Fix warnings reported by static checker.
lpfc: Update version to 10.5.0.0 for upstream patch set
lpfc: Update copyright to 2015
...
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index c69afb5e264e..2fc426926574 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
| @@ -2230,7 +2230,7 @@ static int mmc_blk_alloc_part(struct mmc_card *card, | |||
| 2230 | part_md->part_type = part_type; | 2230 | part_md->part_type = part_type; |
| 2231 | list_add(&part_md->part, &md->part); | 2231 | list_add(&part_md->part, &md->part); |
| 2232 | 2232 | ||
| 2233 | string_get_size((u64)get_capacity(part_md->disk) << 9, STRING_UNITS_2, | 2233 | string_get_size((u64)get_capacity(part_md->disk), 512, STRING_UNITS_2, |
| 2234 | cap_str, sizeof(cap_str)); | 2234 | cap_str, sizeof(cap_str)); |
| 2235 | pr_info("%s: %s %s partition %u %s\n", | 2235 | pr_info("%s: %s %s partition %u %s\n", |
| 2236 | part_md->disk->disk_name, mmc_card_id(card), | 2236 | part_md->disk->disk_name, mmc_card_id(card), |
| @@ -2436,7 +2436,7 @@ static int mmc_blk_probe(struct device *dev) | |||
| 2436 | if (IS_ERR(md)) | 2436 | if (IS_ERR(md)) |
| 2437 | return PTR_ERR(md); | 2437 | return PTR_ERR(md); |
| 2438 | 2438 | ||
| 2439 | string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2, | 2439 | string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, |
| 2440 | cap_str, sizeof(cap_str)); | 2440 | cap_str, sizeof(cap_str)); |
| 2441 | pr_info("%s: %s %s %s %s\n", | 2441 | pr_info("%s: %s %s %s %s\n", |
| 2442 | md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), | 2442 | md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), |