Skip to content

Commit 9ab8781

Browse files
groecksashalevin
authored andcommitted
spi: Fix documentation of spi_alloc_master()
[ Upstream commit a394d635193b641f2c86ead5ada5b115d57c51f8 ] Actually, spi_master_put() after spi_alloc_master() must _not_ be followed by kfree(). The memory is already freed with the call to spi_master_put() through spi_master_class, which registers a release function. Calling both spi_master_put() and kfree() results in often nasty (and delayed) crashes elsewhere in the kernel, often in the networking stack. This reverts commit eb4af0f. Link to patch and concerns: https://lkml.org/lkml/2012/9/3/269 or http://lkml.iu.edu/hypermail/linux/kernel/1209.0/00790.html Alexey Klimov: This revert becomes valid after 94c69f7 when spi-imx.c has been fixed and there is no need to call kfree() so comment for spi_alloc_master() should be fixed. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
1 parent 8ba742c commit 9ab8781

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/spi/spi.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -1478,8 +1478,7 @@ static struct class spi_master_class = {
14781478
*
14791479
* The caller is responsible for assigning the bus number and initializing
14801480
* the master's methods before calling spi_register_master(); and (after errors
1481-
* adding the device) calling spi_master_put() and kfree() to prevent a memory
1482-
* leak.
1481+
* adding the device) calling spi_master_put() to prevent a memory leak.
14831482
*/
14841483
struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
14851484
{

0 commit comments

Comments
 (0)