|
From: <zw...@ma...> - 2009-05-24 22:56:17
|
Author: zwelch
Date: 2009-05-24 22:56:13 +0200 (Sun, 24 May 2009)
New Revision: 1907
Modified:
trunk/src/flash/davinci_nand.c
Log:
David Brownell <da...@pa...>: minor davinci_nand bugfix
Fix a bug that joined us at the last minute, when an efficient
alloca() call got swapped out for a more portable malloc().
Also log one error, to give a clue in case it appears "in the wild".
Modified: trunk/src/flash/davinci_nand.c
===================================================================
--- trunk/src/flash/davinci_nand.c 2009-05-24 11:24:14 UTC (rev 1906)
+++ trunk/src/flash/davinci_nand.c 2009-05-24 20:56:13 UTC (rev 1907)
@@ -258,8 +258,10 @@
return ERROR_NAND_OPERATION_FAILED;
/* Always write both data and OOB ... we are not "raw" I/O! */
- if (!data)
+ if (!data) {
+ LOG_ERROR("Missing NAND data; try 'nand raw_access enable'\n");
return ERROR_NAND_OPERATION_FAILED;
+ }
/* If we're not given OOB, write 0xff where we don't write ECC codes. */
switch (nand->page_size) {
@@ -277,7 +279,7 @@
}
if (!oob) {
ooballoc = malloc(oob_size);
- if (ooballoc)
+ if (!ooballoc)
return ERROR_NAND_OPERATION_FAILED;
oob = ooballoc;
memset(oob, 0x0ff, oob_size);
|