Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[qemu.git] / hw / block / tc58128.c

diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c
index 7909d5041ec149d9c78442940618ae0112978f3c..1d9f7ee000689d401a1058d11c5f7d6e8ca90c3f 100644 (file)
--- a/hw/block/tc58128.c
+++ b/hw/block/tc58128.c
@@ -45,7 +45,7 @@ static void init_dev(tc58128_dev * dev, const char *filename)
             }
        } else {
            /* Build first block with number of blocks */
-           blocks = (ret + 528 * 32 - 1) / (528 * 32);
+            blocks = DIV_ROUND_UP(ret, 528 * 32);
            dev->flash_contents[0] = blocks & 0xff;
            dev->flash_contents[1] = (blocks >> 8) & 0xff;
            dev->flash_contents[2] = (blocks >> 16) & 0xff;