diff options
author | Axel Lin <axel.lin@ingics.com> | 2013-09-20 06:39:18 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-23 09:53:10 -0400 |
commit | 57841439b62e3ddb5ee50e765aa50330dde612d0 (patch) | |
tree | a9d2cb93e4dd40deeaa55ac8fdb26862c44aa9f1 | |
parent | 272b98c6455f00884f0350f775c5342358ebb73f (diff) |
spi: efm32: Don't call kfree() after spi_master_put()
Calling kfree() to clean up the memory obtained from spi_alloc_master() is
wrong as this is done in spi_master_release() when spi_master->dev's refcount
reaches zero.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | drivers/spi/spi-efm32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c index 7d84418a01d8..5b3117f69507 100644 --- a/drivers/spi/spi-efm32.c +++ b/drivers/spi/spi-efm32.c | |||
@@ -467,7 +467,6 @@ err_disable_clk: | |||
467 | clk_disable_unprepare(ddata->clk); | 467 | clk_disable_unprepare(ddata->clk); |
468 | err: | 468 | err: |
469 | spi_master_put(master); | 469 | spi_master_put(master); |
470 | kfree(master); | ||
471 | } | 470 | } |
472 | 471 | ||
473 | return ret; | 472 | return ret; |
@@ -484,7 +483,6 @@ static int efm32_spi_remove(struct platform_device *pdev) | |||
484 | free_irq(ddata->rxirq, ddata); | 483 | free_irq(ddata->rxirq, ddata); |
485 | clk_disable_unprepare(ddata->clk); | 484 | clk_disable_unprepare(ddata->clk); |
486 | spi_master_put(master); | 485 | spi_master_put(master); |
487 | kfree(master); | ||
488 | 486 | ||
489 | return 0; | 487 | return 0; |
490 | } | 488 | } |