From b2bdba0824e088c7e56cb470a417c0a468f09bca Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 7 Nov 2015 11:26:53 -0600 Subject: [PATCH] S25FL1 FLASH driver: Fix return value from the bwrite() method --- ChangeLog | 6 ++++-- arch | 2 +- configs | 2 +- drivers/mtd/st25fl1.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70e64d01fd..c8dd774237 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10881,7 +10881,7 @@ device (2015-08-24). * networking: Correct return value from psock_tcp_accept(). From SaeHie Park (2015-08-25). - * drivers/mtd/st25fl1.c: Add a driver for ST25L1*K QuadSPI parts + * drivers/mtd/s25fl1.c: Add a driver for ST25L1*K QuadSPI parts (2015-08-25). * include/nuttx/spi/qspi.h: Develop a new interface for QSPI, at least the way that QSPI is implemented on the SAMV71. Originally @@ -11071,4 +11071,6 @@ * arch/arm/src/samv7: Add a call to can_txready() to the MCAN driver (2015-11-03). * arch/arm/src/samv7: Add MPU and protected build support (2015-11-06). - + * arch/arm/src/samv7: The QSPI FLASH driver is now functional. This + driver operates in the memory-mapped, Serial Memory Mode (SMM) + (2015-11-07). diff --git a/arch b/arch index dd5268721c..2137b6c754 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit dd5268721c6a5c05ebd441556d3fddeb4b1d0509 +Subproject commit 2137b6c754118003664432d16dd4b69685939c74 diff --git a/configs b/configs index 449de6ca27..8e4edaaa02 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit 449de6ca27fc922687fe586aa65742cffbf2bc2e +Subproject commit 8e4edaaa0293ae3ca1517f6798694d8e96c553bb diff --git a/drivers/mtd/st25fl1.c b/drivers/mtd/st25fl1.c index 2db36adbf5..7a0ad758d0 100644 --- a/drivers/mtd/st25fl1.c +++ b/drivers/mtd/st25fl1.c @@ -1289,7 +1289,7 @@ static ssize_t st25fl1_bwrite(FAR struct mtd_dev_s *dev, off_t startblock, st25fl1_unlock(priv->qspi); - return ret; + return ret < 0 ? ret : nblocks; } /************************************************************************************