From 6dc94c068217f9ea55f84b60725fd4bbc258f7cb Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 12 Nov 2014 14:01:23 -0800 Subject: vboot: fix invalid check for the returned value from spi_flash->write spi_flash->write returns non-zero on error and zero on success, not the number of bytes written. BUG=none BRANCH=ToT TEST=Booted storm. Verified successfully nvdata was saved. Original-Change-Id: If50cc1a62a4f06398d1830cca60085b6f925fff3 Original-Signed-off-by: Daisuke Nojiri Original-Reviewed-on: https://chromium-review.googlesource.com/229389 Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Randall Spangler (cherry picked from commit 1e8cdbdb07e99c3f72c35f76d68144f46107acd9) Signed-off-by: Aaron Durbin Change-Id: I216e97f734da8d4b52c2da8329f4143b7b0656cd Reviewed-on: http://review.coreboot.org/9439 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/vendorcode/google/chromeos/vbnv_flash.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vendorcode/google/chromeos/vbnv_flash.c b/src/vendorcode/google/chromeos/vbnv_flash.c index cf7c002bcd..665c184273 100644 --- a/src/vendorcode/google/chromeos/vbnv_flash.c +++ b/src/vendorcode/google/chromeos/vbnv_flash.c @@ -175,8 +175,7 @@ void save_vbnv(const uint8_t *vbnv_copy) if (vbnv_flash_probe()) return; /* error */ - if (spi_flash->write(spi_flash, new_offset, - BLOB_SIZE, vbnv_copy) != BLOB_SIZE) { + if (spi_flash->write(spi_flash, new_offset, BLOB_SIZE, vbnv_copy)) { printk(BIOS_ERR, "failed to write nvdata\n"); return; /* error */ } -- cgit v1.2.3