summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorCédric Le Goater <clg@kaod.org>2016-05-31 13:36:05 +0200
committerKevin Wolf <kwolf@redhat.com>2016-06-16 15:19:55 +0200
commit9e19036e5a3c5abfe57984ca98ab064acfca83a3 (patch)
treedef9a31194cc57241a4985955b347745daa95b3b /hw
parent479b5998d4149bef94a5900291b51804eff39a3d (diff)
downloadqemu-9e19036e5a3c5abfe57984ca98ab064acfca83a3.tar.gz
qemu-9e19036e5a3c5abfe57984ca98ab064acfca83a3.tar.bz2
qemu-9e19036e5a3c5abfe57984ca98ab064acfca83a3.zip
m25p80: fix test on blk_pread() return value
commit 243e6f69c129 ("m25p80: Switch to byte-based block access") replaced blk_read() calls with blk_pread() but return values are different. Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/block/m25p80.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 4c856f5278..51d8596056 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -900,7 +900,7 @@ static int m25p80_init(SSISlave *ss)
s->storage = blk_blockalign(s->blk, s->size);
/* FIXME: Move to late init */
- if (blk_pread(s->blk, 0, s->storage, s->size)) {
+ if (blk_pread(s->blk, 0, s->storage, s->size) != s->size) {
fprintf(stderr, "Failed to initialize SPI flash!\n");
return 1;
}