Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7d9377e authored by Paul Parsons's avatar Paul Parsons Committed by David Woodhouse
Browse files

mtd: chips: cfi_cmdset_0002: Match ENABLE_VPP()/DISABLE_VPP() calls 



This patch is part of a set which fixes unnecessary flash erase and write errors
resulting from the MTD CFI driver turning off vpp while an erase is in progress.
This patch ensures that only those flash operations which call ENABLE_VPP() can
then call DISABLE_VPP(). Other operations should never call DISABLE_VPP().

Signed-off-by: default avatarPaul Parsons <lost.distance@yahoo.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 85e5b2f2

drivers/mtd/chips/cfi_cmdset_0002.c

+4 −2
Original line number Diff line number Diff line
@@ -774,8 +774,6 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad 


	case FL_READY:

	case FL_STATUS:

		/* We should really make set_vpp() count, rather than doing this */

		DISABLE_VPP(map);

		break;

	default:

		printk(KERN_ERR "MTD: put_chip() called with oldstate %d!!\n", chip->oldstate);
@@ -1229,6 +1227,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, 
	xip_enable(map, chip, adr);

 op_done:

	chip->state = FL_READY;

	DISABLE_VPP(map);

	put_chip(map, chip, adr);

	mutex_unlock(&chip->mutex);
@@ -1467,6 +1466,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, 
	ret = -EIO;

 op_done:

	chip->state = FL_READY;

	DISABLE_VPP(map);

	put_chip(map, chip, adr);

	mutex_unlock(&chip->mutex);
@@ -1868,6 +1868,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip) 


	chip->state = FL_READY;

	xip_enable(map, chip, adr);

	DISABLE_VPP(map);

	put_chip(map, chip, adr);

	mutex_unlock(&chip->mutex);
@@ -1958,6 +1959,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, 
	}



	chip->state = FL_READY;

	DISABLE_VPP(map);

	put_chip(map, chip, adr);

	mutex_unlock(&chip->mutex);

	return ret;