diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-18 06:16:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-18 06:16:26 +1000 |
| commit | 374316c2e443c1b0388a251b7f35cf3ff67440d1 (patch) | |
| tree | b118ef2bee83cde13dda3fc6c021d9acf09ffc90 /drivers | |
| parent | 872a2a8204685daad2c6b394c2b5c19a58506dd7 (diff) | |
| parent | 5d20bad19d25bb25d9e831dd342c7c714d872b53 (diff) | |
Merge remote-tracking branch 'mtd/master'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0002.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 5a4bfe33112a..46c4643b7a07 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -1434,6 +1434,10 @@ static int cfi_amdstd_otp_walk(struct mtd_info *mtd, loff_t from, size_t len, mutex_lock(&chip->mutex); ret = get_chip(map, chip, base, FL_LOCKING); + if (ret) { + mutex_unlock(&chip->mutex); + return ret; + } /* Enter lock register command */ cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, |