]> git.proxmox.com Git - mirror_qemu.git/commitdiff
m25p80: fix test on blk_pread() return value
authorCédric Le Goater <clg@kaod.org>
Tue, 31 May 2016 11:36:05 +0000 (13:36 +0200)
committerKevin Wolf <kwolf@redhat.com>
Thu, 16 Jun 2016 13:19:55 +0000 (15:19 +0200)
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>
hw/block/m25p80.c

index 4c856f5278c35ac3c9f46a87d43381464c3c243d..51d85960566f9ca086ef7fc85a700175704bfc1d 100644 (file)
@@ -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;
         }