summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-txx9.c
diff options
context:
space:
mode:
authorWei Yongjun2013-11-15 08:49:29 +0100
committerMark Brown2013-11-15 11:31:04 +0100
commitb38f87ec503ac68e5c38044101eedba869a56b0d (patch)
treed6f9fe847b755e742f1b808a7494073754aede3e /drivers/spi/spi-txx9.c
parentMerge remote-tracking branch 'spi/topic/wr' into spi-next (diff)
downloadkernel-qcow2-linux-b38f87ec503ac68e5c38044101eedba869a56b0d.tar.gz
kernel-qcow2-linux-b38f87ec503ac68e5c38044101eedba869a56b0d.tar.xz
kernel-qcow2-linux-b38f87ec503ac68e5c38044101eedba869a56b0d.zip
spi: txx9: fix reference leak to master in txx9spi_remove()
Once a spi_master_get() call succeeds, we need an additional spi_master_put() call to free the memory, otherwise we will leak a reference to master. Fix by removing the unnecessary spi_master_get() call. Fixes: 2fe7e4add3e5 ('spi: txx9: use devm_spi_register_master()') Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-txx9.c')
-rw-r--r--drivers/spi/spi-txx9.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index 637cce2b8bdd..18c9bb2b5f39 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -425,7 +425,7 @@ exit:
static int txx9spi_remove(struct platform_device *dev)
{
- struct spi_master *master = spi_master_get(platform_get_drvdata(dev));
+ struct spi_master *master = platform_get_drvdata(dev);
struct txx9spi *c = spi_master_get_devdata(master);
destroy_workqueue(c->workqueue);