From: Markus Elfring <[email protected]>
Date: Wed, 11 Jan 2017 16:40:47 +0100

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

Signed-off-by: Markus Elfring <[email protected]>
---
 drivers/mtd/chips/cfi_cmdset_0001.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c 
b/drivers/mtd/chips/cfi_cmdset_0001.c
index 0c0fa918c9ff..4b134e8beb93 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1552,10 +1552,8 @@ static int __xipram do_write_oneword(struct map_info 
*map, struct flchip *chip,
 
        mutex_lock(&chip->mutex);
        ret = get_chip(map, chip, adr, mode);
-       if (ret) {
-               mutex_unlock(&chip->mutex);
-               return ret;
-       }
+       if (ret)
+               goto unlock;
 
        XIP_INVAL_CACHED_RANGE(map, adr, map_bankwidth(map));
        ENABLE_VPP(map);
@@ -1600,6 +1598,7 @@ static int __xipram do_write_oneword(struct map_info 
*map, struct flchip *chip,
        xip_enable(map, chip, adr);
  out:  DISABLE_VPP(map);
        put_chip(map, chip, adr);
+unlock:
        mutex_unlock(&chip->mutex);
        return ret;
 }
-- 
2.11.0

Reply via email to