Skip to content

Commit 00b349a

Browse files
groeckgregkh
authored andcommitted
spi: Fix documentation of spi_alloc_master()
commit a394d63 upstream. 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 <[email protected]> Signed-off-by: Alexey Klimov <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 709b415 commit 00b349a

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/spi/spi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,8 +1251,7 @@ static struct class spi_master_class = {
12511251
*
12521252
* The caller is responsible for assigning the bus number and initializing
12531253
* the master's methods before calling spi_register_master(); and (after errors
1254-
* adding the device) calling spi_master_put() and kfree() to prevent a memory
1255-
* leak.
1254+
* adding the device) calling spi_master_put() to prevent a memory leak.
12561255
*/
12571256
struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
12581257
{

0 commit comments

Comments
 (0)