Merge branch 'for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[sfrench/cifs-2.6.git] / drivers / mtd / devices / mchp23k256.c

diff --git a/drivers/mtd/devices/mchp23k256.c b/drivers/mtd/devices/mchp23k256.c
index 8956b7dcc984f9d45d65a9be2e52b63dc38871c0..75f71d166fd6b31d871a0116073223c7554ecdd7 100644 (file)
--- 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;
 }