From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753601Ab2ICU0k (ORCPT ); Mon, 3 Sep 2012 16:26:40 -0400 Received: from mail.active-venture.com ([67.228.131.205]:52175 "EHLO mail.active-venture.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753398Ab2ICU0i (ORCPT ); Mon, 3 Sep 2012 16:26:38 -0400 X-Virus-Scan: Scanned by ClamAV 0.97.2 (no viruses); Mon, 03 Sep 2012 15:26:38 -0500 X-Originating-IP: 108.223.40.66 From: Guenter Roeck To: spi-devel-general@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, Grant Likely , Mark Brown , Guenter Roeck , Uwe Kleine-Koenig Subject: [PATCH] Revert "spi/doc: spi_master_put must be followed up by kfree" Date: Mon, 3 Sep 2012 13:26:26 -0700 Message-Id: <1346703986-7849-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.7.9.7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 eb4af0f5349235df2e4a5057a72fc8962d00308a. Cc: Uwe Kleine-Koenig Signed-off-by: Guenter Roeck --- drivers/spi/spi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 2d9b5bb..6470750 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1082,8 +1082,7 @@ static struct class spi_master_class = { * * The caller is responsible for assigning the bus number and initializing * the master's methods before calling spi_register_master(); and (after errors - * adding the device) calling spi_master_put() and kfree() to prevent a memory - * leak. + * adding the device) calling spi_master_put() to prevent a memory leak. */ struct spi_master *spi_alloc_master(struct device *dev, unsigned size) { -- 1.7.9.7