diff mbox series

mtd: mchp23k256: propagate return value of spi_sync()

Message ID 20171210151956.2053-1-borneo.antonio@gmail.com
State Accepted
Delegated to: Boris Brezillon
Headers show
Series mtd: mchp23k256: propagate return value of spi_sync() | expand

Commit Message

Antonio Borneo Dec. 10, 2017, 3:19 p.m. UTC 
The call to spi_sync() can fail.
Check the return value and propagate it.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
---
To: David Woodhouse <dwmw2@infradead.org>
To: Brian Norris <computersforpeace@gmail.com>
To: Boris Brezillon <boris.brezillon@free-electrons.com>
To: Marek Vasut <marek.vasut@gmail.com>
To: Richard Weinberger <richard@nod.at>
To: Cyrille Pitchen <cyrille.pitchen@atmel.com>
To: Andrew Lunn <andrew@lunn.ch>
To: Chris Packham <chris.packham@alliedtelesis.co.nz>
To: Rob Herring <robh@kernel.org>
To: linux-mtd@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/mtd/devices/mchp23k256.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

Comments

Andrew Lunn Dec. 14, 2017, 9:08 a.m. UTC | #1 
On Sun, Dec 10, 2017 at 04:19:56PM +0100, Antonio Borneo wrote:
> The call to spi_sync() can fail.
> Check the return value and propagate it.
> 
> Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew
Boris Brezillon Dec. 18, 2017, 4:22 p.m. UTC | #2 
On Thu, 14 Dec 2017 10:08:24 +0100
Andrew Lunn <andrew@lunn.ch> wrote:

> On Sun, Dec 10, 2017 at 04:19:56PM +0100, Antonio Borneo wrote:
> > The call to spi_sync() can fail.
> > Check the return value and propagate it.
> > 
> > Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>  
> 
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>

Applied.

Thanks,

Boris

> 
>     Andrew
> 
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/
diff mbox series

Patch

diff --git a/drivers/mtd/devices/mchp23k256.c b/drivers/mtd/devices/mchp23k256.c
index 787e9ec7..4c91c0e 100644
--- a/drivers/mtd/devices/mchp23k256.c
+++ b/drivers/mtd/devices/mchp23k256.c
@@ -68,6 +68,7 @@  static int mchp23k256_write(struct mtd_info *mtd, loff_t to, size_t len,
 	struct spi_transfer transfer[2] = {};
 	struct spi_message message;
 	unsigned char command[MAX_CMD_SIZE];
+	int ret;
 
 	spi_message_init(&message);
 
@@ -84,12 +85,16 @@  static int mchp23k256_write(struct mtd_info *mtd, loff_t to, size_t len,
 
 	mutex_lock(&flash->lock);
 
-	spi_sync(flash->spi, &message);
+	ret = spi_sync(flash->spi, &message);
+
+	mutex_unlock(&flash->lock);
+
+	if (ret)
+		return ret;
 
 	if (retlen && message.actual_length > sizeof(command))
 		*retlen += message.actual_length - sizeof(command);
 
-	mutex_unlock(&flash->lock);
 	return 0;
 }
 
@@ -100,6 +105,7 @@  static int mchp23k256_read(struct mtd_info *mtd, loff_t from, size_t len,
 	struct spi_transfer transfer[2] = {};
 	struct spi_message message;
 	unsigned char command[MAX_CMD_SIZE];
+	int ret;
 
 	spi_message_init(&message);
 
@@ -117,12 +123,16 @@  static int mchp23k256_read(struct mtd_info *mtd, loff_t from, size_t len,
 
 	mutex_lock(&flash->lock);
 
-	spi_sync(flash->spi, &message);
+	ret = spi_sync(flash->spi, &message);
+
+	mutex_unlock(&flash->lock);
+
+	if (ret)
+		return ret;
 
 	if (retlen && message.actual_length > sizeof(command))
 		*retlen += message.actual_length - sizeof(command);
 
-	mutex_unlock(&flash->lock);
 	return 0;
 }