summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-10-11 15:39:12 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-26 11:36:09 +0100
commit3339c3bf3d779cc9de21bd9501d08ac651b22dc1 (patch)
tree66420f800be99d7282534575b595043efda21902 /drivers/memstick
parentd9c74d3fe297a9b056e1fe6a60c78578296cdb0e (diff)
downloadlinux-stable-3339c3bf3d779cc9de21bd9501d08ac651b22dc1.tar.gz
linux-stable-3339c3bf3d779cc9de21bd9501d08ac651b22dc1.tar.bz2
linux-stable-3339c3bf3d779cc9de21bd9501d08ac651b22dc1.zip
memstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host()
[ Upstream commit beae4a6258e64af609ad5995cc6b6056eb0d898e ] The "msh" pointer is device managed, meaning that memstick_alloc_host() calls device_initialize() on it. That means that it can't be free using kfree() but must instead be freed with memstick_free_host(). Otherwise it leads to a tiny memory leak of device resources. Fixes: 60fdd931d577 ("memstick: add support for JMicron jmb38x MemoryStick host controller") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Link: https://lore.kernel.org/r/20211011123912.GD15188@kili Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/host/jmb38x_ms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index 29f5021d21ea..0610d3c9f131 100644
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -907,7 +907,7 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt)
iounmap(host->addr);
err_out_free:
- kfree(msh);
+ memstick_free_host(msh);
return NULL;
}