Commit 71b1b553 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull MTD fixes from Richard Weinberger:
 "Two fixes for MTD:

   - spi-nor: Fix for a regression in write_sr()

   - rawnand: Regression fix for the au1550nd driver"

* tag 'fixes-for-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: rawnand: au1550nd: Fix au_read_buf16() prototype
  mtd: spi-nor: Fix direction of the write_sr() transfer
parents b27528b0 df8fed83
...@@ -134,16 +134,15 @@ static void au_write_buf16(struct nand_chip *this, const u_char *buf, int len) ...@@ -134,16 +134,15 @@ static void au_write_buf16(struct nand_chip *this, const u_char *buf, int len)
/** /**
* au_read_buf16 - read chip data into buffer * au_read_buf16 - read chip data into buffer
* @mtd: MTD device structure * @this: NAND chip object
* @buf: buffer to store date * @buf: buffer to store date
* @len: number of bytes to read * @len: number of bytes to read
* *
* read function for 16bit buswidth * read function for 16bit buswidth
*/ */
static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len) static void au_read_buf16(struct nand_chip *this, u_char *buf, int len)
{ {
int i; int i;
struct nand_chip *this = mtd_to_nand(mtd);
u16 *p = (u16 *) buf; u16 *p = (u16 *) buf;
len >>= 1; len >>= 1;
......
...@@ -487,7 +487,7 @@ static int write_sr(struct spi_nor *nor, u8 val) ...@@ -487,7 +487,7 @@ static int write_sr(struct spi_nor *nor, u8 val)
SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WRSR, 1), SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WRSR, 1),
SPI_MEM_OP_NO_ADDR, SPI_MEM_OP_NO_ADDR,
SPI_MEM_OP_NO_DUMMY, SPI_MEM_OP_NO_DUMMY,
SPI_MEM_OP_DATA_IN(1, nor->bouncebuf, 1)); SPI_MEM_OP_DATA_OUT(1, nor->bouncebuf, 1));
return spi_mem_exec_op(nor->spimem, &op); return spi_mem_exec_op(nor->spimem, &op);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment