[PATCH] mtd: cfi_cmdset_0002: Fix trivial merge conflict

[Kevin Cernekee]

Stefani Seibold's patch changed chip->mutex, once a spinlock, into a
mutex.  This patch applies the same change to cfi_amdstd_reset(), part
of the new reboot notifier code.

Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index d356827..c16b8ce 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1945,7 +1945,7 @@ static int cfi_amdstd_reset(struct mtd_info *mtd)
 
 		chip = &cfi->chips[i];
 
-		spin_lock(chip->mutex);
+		mutex_lock(&chip->mutex);
 
 		ret = get_chip(map, chip, chip->start, FL_SHUTDOWN);
 		if (!ret) {
@@ -1954,7 +1954,7 @@ static int cfi_amdstd_reset(struct mtd_info *mtd)
 			put_chip(map, chip, chip->start);
 		}
 
-		spin_unlock(chip->mutex);
+		mutex_unlock(&chip->mutex);
 	}
 
 	return 0;
-- 
1.6.3.1