From 82564eebdc85a799d2206fbebd59cafb409c7dd6 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 10 Dec 2009 14:23:57 +0100
Subject: [PATCH] --- yaml --- r: 176995 b: refs/heads/master c:
 caf0e8e028516253afce6e40c52f0c193a221f8a h: refs/heads/master i:   176993:
 f29788eaf8d3c0b3b3ca771b4ec70abd01996066   176991:
 0de1a8b943efb17f1f5badd16098fc0ad1576b4d v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/mtd/chips/cfi_cmdset_0002.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 42095e675199..d26c2ff2a30e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51eeb878155cdea73e7a1f0372b266018bd7a424
+refs/heads/master: caf0e8e028516253afce6e40c52f0c193a221f8a
diff --git a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
index 1d49e18adbf6..f3600e8d5382 100644
--- a/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/trunk/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -569,7 +569,6 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
 
 			if (time_after(jiffies, timeo)) {
 				printk(KERN_ERR "Waiting for chip to be ready timed out.\n");
-				spin_unlock(chip->mutex);
 				return -EIO;
 			}
 			spin_unlock(chip->mutex);