summaryrefslogtreecommitdiffstats
path: root/drivers/mci/mci-core.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-17 09:43:40 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-17 09:43:40 +0100
commit2f0109b1bb833fe3481b37a6cfa0ae319d248754 (patch)
treea7b1d214a66fcc4f5618fc4e4fec6d23237b6b28 /drivers/mci/mci-core.c
parent2fed74ef6d446552300cc254de7b3e26140b04fe (diff)
parentd0e7facd5482c31a5640b31c9a4555e5a4ee215c (diff)
downloadbarebox-2f0109b1bb833fe3481b37a6cfa0ae319d248754.tar.gz
barebox-2f0109b1bb833fe3481b37a6cfa0ae319d248754.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'drivers/mci/mci-core.c')
-rw-r--r--drivers/mci/mci-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index c196185b8a..01371523d8 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -1001,13 +1001,13 @@ static int mci_sd_read(struct device_d *disk_dev, uint64_t sector_start,
while (sector_count) {
int now = min(sector_count, 32U);
if (sector_start > MAX_BUFFER_NUMBER) {
- pr_err("Cannot handle block number %lu. Too large!\n",
+ pr_err("Cannot handle block number %u. Too large!\n",
(unsigned)sector_start);
return -EINVAL;
}
rc = mci_read_block(mci_dev, buffer, (unsigned)sector_start, now);
if (rc != 0) {
- pr_err("Reading block %lu failed with %d\n", (unsigned)sector_start, rc);
+ pr_err("Reading block %u failed with %d\n", (unsigned)sector_start, rc);
return rc;
}
sector_count -= now;