Re: [2/2] spi: Add SPI master controller for OCTEON SOCs.
From: Guenter Roeck <linux@roeck-us.net>
Date: 2012-08-21 19:49:35
Also in:
linux-devicetree, linux-spi, lkml
From: Guenter Roeck <linux@roeck-us.net>
Date: 2012-08-21 19:49:35
Also in:
linux-devicetree, linux-spi, lkml
On Fri, May 11, 2012 at 08:34:46PM -0000, David Daney wrote:
From: David Daney <redacted> Add the driver, link it into the kbuild system and provide device tree binding documentation. Signed-off-by: David Daney <redacted> Acked-by: Grant Likely <redacted>
[ ... ]
+
+static int __devexit octeon_spi_remove(struct platform_device *pdev)
+{
+ struct octeon_spi *p = platform_get_drvdata(pdev);
+ struct spi_master *master = p->my_master;
+
+ spi_unregister_master(master);
+I know it is a bit late, but ... The call to spi_unregister_master() frees the memory associated with master, ie 'p', and the spi_master_put() below without matching spi_master_get() is unnecessary/wrong. One possible fix would be to use struct spi_master *master = spi_master_get(p->my_master); above. That protects master and p while it is still being used, and makes use of the call to spi_master_put() below. Another option might be to move cvmx_write_csr() ahead of the call to spi_unregister_master() and drop the call to spi_master_put(). Guenter
+ /* Clear the CSENA* and put everything in a known state. */ + cvmx_write_csr(p->register_base + OCTEON_SPI_CFG, 0); + spi_master_put(master); + return 0; +} +