Skip to contentSkip to conversation

mtd: mchp23k256: propagate return value of spi_sync()

PATCH Applied Antonio Borneo 3 participants 3 messages Dec 10, 2017 – Dec 18, 2017 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd: mchp23k256: propagate return value of spi_sync()

The call to spi_sync() can fail.
Check the return value and propagate it.

---
To: David Woodhouse <[email protected]>
To: Brian Norris <[email protected]>
To: Boris Brezillon <[email protected]>
To: Marek Vasut <[email protected]>
To: Richard Weinberger <[email protected]>
To: Cyrille Pitchen <[email protected]>
To: Andrew Lunn <[email protected]>
To: Chris Packham <[email protected]>
To: Rob Herring <[email protected]>
To: [email protected]
Cc: [email protected]

---
 drivers/mtd/devices/mchp23k256.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/mtd/devices/mchp23k256.c +14 -4
index 787e9ec7..4c91c0e 100644
@@ -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;
 }
 
Signature · 1 line
2.7.4
#2 lore raw
Quoted 7 lines · On Thu, 14 Dec 2017 10:08:24 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 4 lines · Antonio Borneo

The call to spi_sync() can fail.
Check the return value and propagate it.

Applied.

Thanks,

Boris

Quoted 6 lines

Andrew

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/