Commit 203ba0f6 authored by Richard Weinberger's avatar Richard Weinberger
Browse files

Merge tag 'cfi/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next 

CFI changes

Just a couple of fixes for v5.13-rc1
* Disable broken buffered writes for CFI chips within ID 0x2201
* Address a Coverity report for unused value
parents 28f0be44 f3907773

drivers/mtd/chips/cfi_cmdset_0002.c

+5 −1
Original line number Diff line number Diff line
@@ -272,6 +272,10 @@ static void fixup_use_write_buffers(struct mtd_info *mtd) 
{

	struct map_info *map = mtd->priv;

	struct cfi_private *cfi = map->fldrv_priv;



	if (cfi->mfr == CFI_MFR_AMD && cfi->id == 0x2201)

		return;



	if (cfi->cfiq->BufWriteTimeoutTyp) {

		pr_debug("Using buffer write method\n");

		mtd->_write = cfi_amdstd_write_buffers;
@@ -1650,7 +1654,7 @@ static int __xipram do_write_oneword_once(struct map_info *map, 
					  unsigned long adr, map_word datum,

					  int mode, struct cfi_private *cfi)

{

	unsigned long timeo = jiffies + HZ;

	unsigned long timeo;

	/*

	 * We use a 1ms + 1 jiffies generic timeout for writes (most devices

	 * have a max write time of a few hundreds usec). However, we should