Commit 42f38ccb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/fixes-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull mtd revert from Miquel Raynal:
 "Very late this cycle we identified a breakage that could potentially
  hit several spi controller drivers because of a change in the way the
  dummy cycles validity is checked.

  We do not know at the moment how to handle the situation properly, so
  we prefer to revert the faulty patch for the next release"

* tag 'mtd/fixes-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  Revert "mtd: spi-nor: core: replace dummy buswidth from addr to data"
parents 07757eeb d15638bf

drivers/mtd/spi-nor/core.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void spi_nor_spimem_setup_op(const struct spi_nor *nor, 
		op->addr.buswidth = spi_nor_get_protocol_addr_nbits(proto);



	if (op->dummy.nbytes)

		op->dummy.buswidth = spi_nor_get_protocol_data_nbits(proto);

		op->dummy.buswidth = spi_nor_get_protocol_addr_nbits(proto);



	if (op->data.nbytes)

		op->data.buswidth = spi_nor_get_protocol_data_nbits(proto);