mtd: cfi_cmdset_0002: Fix trivial merge conflict

Submitted by Kevin Cernekee on April 29, 2010, 12:26 a.m.

Details

Message ID 02d08adf6882611e6c0121481e70a61d20a10acf@localhost.localdomain
State New, archived
Headers show

Commit Message

Kevin Cernekee April 29, 2010, 12:26 a.m.
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@gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Artem Bityutskiy April 29, 2010, 5:34 a.m.
On Wed, 2010-04-28 at 17:26 -0700, Kevin Cernekee wrote:
> 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@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;

Could you instead resend one patch which is a merge of this one and the
old one, please?

Patch hide | download patch | download mbox

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;