From 1e07392e7b147fd15082f9b755fc249e853f9b96 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Tue, 22 May 2018 12:55:14 +0200 Subject: mtd: devices: m25p80: Use spi_mem_set_drvdata() instead of spi_set_drvdata() SPI mem drivers should use spi_mem_set_drvdata() not spi_set_drvdata() to store their private data. Using spi_set_drvdata() will mess the spi -> spi-mem link up and cause a kernel panic at shutdown or device removal time. Fixes: 4120f8d158ef ("mtd: spi-nor: Use the spi_mem_xx() API") Reported-by: Marek Vasut Signed-off-by: Boris Brezillon Tested-by: Geert Uytterhoeven Tested-by: Marek Vasut on R8A7791 Porter Signed-off-by: Mark Brown --- drivers/mtd/devices/m25p80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mtd/devices/m25p80.c') diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 3dc022d3b53e..e84563d2067f 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -182,7 +182,7 @@ static int m25p_probe(struct spi_mem *spimem) spi_nor_set_flash_node(nor, spi->dev.of_node); nor->priv = flash; - spi_set_drvdata(spi, flash); + spi_mem_set_drvdata(spimem, flash); flash->spimem = spimem; if (spi->mode & SPI_RX_QUAD) { -- cgit v1.2.3-59-g8ed1b