Unverified Commit ac82229d authored by Tudor Ambarus's avatar Tudor Ambarus
Browse files

mtd: spi-nor: Make sure nor->spimem and nor->controller_ops are mutually exclusive 



Expand the spi_nor_check() to make sure that nor->spimem and
nor->controller_ops are mutually exclusive.

Fixes: b35b9a10 ("mtd: spi-nor: Move m25p80 code in spi-nor.c")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
parent 658488ed

drivers/mtd/spi-nor/spi-nor.c

+6 −0
Original line number Diff line number Diff line
@@ -2878,6 +2878,7 @@ write_err: 
static int spi_nor_check(struct spi_nor *nor)

{

	if (!nor->dev ||

	    (!nor->spimem && !nor->controller_ops) ||

	    (!nor->spimem && nor->controller_ops &&

	    (!nor->controller_ops->read ||

	     !nor->controller_ops->write ||
@@ -2887,6 +2888,11 @@ static int spi_nor_check(struct spi_nor *nor) 
		return -EINVAL;

	}



	if (nor->spimem && nor->controller_ops) {

		dev_err(nor->dev, "nor->spimem and nor->controller_ops are mutually exclusive, please set just one of them.\n");

		return -EINVAL;

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE