linux-kernel - [PATCH] mtd: cfi_cmdset_0002: Fix trivial merge conflict

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <02d08adf6882611e6c0121481e70a61d20a10acf@localhost.localdomain>
Date:	Wed, 28 Apr 2010 17:26:01 -0700
From:	Kevin Cernekee <cernekee@...il.com>
To:	<dwmw2@...radead.org>, <dedekind1@...il.com>
Cc:	<linux-mtd@...ts.infradead.org>, <linux-kernel@...r.kernel.org>
Subject: [PATCH] mtd: cfi_cmdset_0002: Fix trivial merge conflict

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@...il.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/