summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2018-11-09 10:55:04 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2018-11-09 10:55:04 +0100
commitb2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d (patch)
treec7bf18bd3f6eef491dd62d383f836e4536c811cb /commands
parentac9c1beb361e3c71e0b9b59d38e5022f12c263c6 (diff)
parent459bf1fd31da2c091c6c1e3a7e0f6a1b1cbf588b (diff)
downloadbarebox-b2cc1d18f57f8af42347a4b7a05afcc7e3e6d66d.tar.gz
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
-rw-r--r--commands/mem.c3
-rw-r--r--commands/miitool.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/commands/mem.c b/commands/mem.c
index eb91ade..cdd7a49 100644
--- a/commands/mem.c
+++ b/commands/mem.c
@@ -96,7 +96,8 @@ static int mem_probe(struct device_d *dev)
dev->priv = cdev;
cdev->name = (char*)dev->resource[0].name;
- cdev->size = (unsigned long)resource_size(&dev->resource[0]);
+ cdev->size = min(resource_size(&dev->resource[0]),
+ (unsigned long long)S64_MAX);
cdev->ops = &memops;
cdev->dev = dev;
diff --git a/commands/miitool.c b/commands/miitool.c
index dea4f85..acf6142 100644
--- a/commands/miitool.c
+++ b/commands/miitool.c
@@ -115,7 +115,7 @@ static int show_basic_mii(struct mii_bus *mii, struct phy_device *phydev,
for (i = 0; i < 32; i++)
mii_val[i] = mii->read(mii, phydev->addr, i);
- printf((mii->parent->id) < 0 ? "%s: %s:" : "%s: %s%d: ",
+ printf((mii->parent->id) < 0 ? "%s: %s: " : "%s: %s%d: ",
phydev->cdev.name, mii->parent->name, mii->parent->id);