Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[MTD] cfi_cmdset_0001: relax locking rules for multi hardware partition support

Browse source 
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Nicolas Pitre 2005-11-23 22:07:56 +00:00 committed by Thomas Gleixner
parent 7ac571f8d0
commit 8bc3b3804a
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/mtd/chips/cfi_cmdset_0001.c
View file

@ -4,7 +4,7 @@
* *
* (C) 2000 Red Hat. GPL'd * (C) 2000 Red Hat. GPL'd
* *
* $Id: cfi_cmdset_0001.c,v 1.185 2005/11/07 11:14:22 gleixner Exp $ * $Id: cfi_cmdset_0001.c,v 1.186 2005/11/23 22:07:52 nico Exp $
* *
* *
* 10/10/2000 Nicolas Pitre <nico@cam.org> * 10/10/2000 Nicolas Pitre <nico@cam.org>
@ -644,9 +644,8 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
* *
* - contension arbitration is handled in the owner's context. * - contension arbitration is handled in the owner's context.
* *
* The 'shared' struct can be read when its lock is taken. * The 'shared' struct can be read and/or written only when
* However any writes to it can only be made when the current * its lock is taken.
* owner's lock is also held.
*/ */
struct flchip_shared *shared = chip->priv; struct flchip_shared *shared = chip->priv;
struct flchip *contender; struct flchip *contender;
@ -675,14 +674,13 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
} }
timeo = jiffies + HZ; timeo = jiffies + HZ;
spin_lock(&shared->lock); spin_lock(&shared->lock);
spin_unlock(contender->mutex);
} }
/* We now own it */ /* We now own it */
shared->writing = chip; shared->writing = chip;
if (mode == FL_ERASING) if (mode == FL_ERASING)
shared->erasing = chip; shared->erasing = chip;
if (contender && contender != chip)
spin_unlock(contender->mutex);
spin_unlock(&shared->lock); spin_unlock(&shared->lock);
} }