Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752790Ab0D2Ahf (ORCPT ); Wed, 28 Apr 2010 20:37:35 -0400 Received: from [69.28.251.93] ([69.28.251.93]:47381 "EHLO b32.net" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751025Ab0D2Ahe (ORCPT ); Wed, 28 Apr 2010 20:37:34 -0400 From: Kevin Cernekee Date: Wed, 28 Apr 2010 17:26:01 -0700 Subject: [PATCH] mtd: cfi_cmdset_0002: Fix trivial merge conflict Message-Id: <02d08adf6882611e6c0121481e70a61d20a10acf@localhost.localdomain> To: , Cc: , User-Agent: vim 7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1214 Lines: 39 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/