[PATCH] spi: fsl-spi: Fix memory leak

[PATCH] spi: fsl-spi: Fix memory leak

[Axel Lin]

mpc8xxx_spi_probe() has set master->cleanup = mpc8xxx_spi_cleanup,
however current code overrides the setting in fsl_spi_probe() and set
master->cleanup = fsl_spi_cleanup.
Thus the memory allocated for cs is not freed anywhere.
Convert to use devm_kzalloc to fix the memory leak.

Signed-off-by: Axel Lin <axel.lin-8E1dMatC8ynQT0dZR+AlfA@public.gmane.org>
---
 drivers/spi/spi-fsl-spi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index f35488e..9effb91 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -430,7 +430,7 @@ static int fsl_spi_setup(struct spi_device *spi)
 		return -EINVAL;
 
 	if (!cs) {
-		cs = kzalloc(sizeof *cs, GFP_KERNEL);
+		cs = devm_kzalloc(&spi->dev, sizeof(*cs), GFP_KERNEL);
 		if (!cs)
 			return -ENOMEM;
 		spi->controller_state = cs;
-- 
1.8.3.2



--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: fsl-spi: Fix memory leak

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

On Sun, Mar 30, 2014 at 04:42:57PM +0800, Axel Lin wrote:
> mpc8xxx_spi_probe() has set master->cleanup = mpc8xxx_spi_cleanup,
> however current code overrides the setting in fsl_spi_probe() and set
> master->cleanup = fsl_spi_cleanup.
> Thus the memory allocated for cs is not freed anywhere.
> Convert to use devm_kzalloc to fix the memory leak.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]