diff options
| author | Mark Brown <broonie@kernel.org> | 2019-02-20 17:58:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-20 17:58:18 +0000 |
| commit | bf9f742c38c4604a8ee349f7baefca58b3a5ff67 (patch) | |
| tree | fa4d349e4a843bf5543f6e7ab6e73dce1eda10e9 /drivers/spi/spi-mem.c | |
| parent | 484a9a68d669f899657a97dbb369cb3e3be7e7f5 (diff) | |
| parent | ef070b4e4aa25bb5f8632ad196644026c11903bf (diff) | |
| download | linux-bf9f742c38c4604a8ee349f7baefca58b3a5ff67.tar.gz linux-bf9f742c38c4604a8ee349f7baefca58b3a5ff67.tar.bz2 linux-bf9f742c38c4604a8ee349f7baefca58b3a5ff67.zip | |
Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.1
Diffstat (limited to 'drivers/spi/spi-mem.c')
| -rw-r--r-- | drivers/spi/spi-mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index 08e326a124cc..a4d8d19ecff9 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -537,7 +537,6 @@ EXPORT_SYMBOL_GPL(spi_mem_dirmap_create); /** * spi_mem_dirmap_destroy() - Destroy a direct mapping descriptor * @desc: the direct mapping descriptor to destroy - * @info: direct mapping information * * This function destroys a direct mapping descriptor previously created by * spi_mem_dirmap_create(). @@ -548,6 +547,8 @@ void spi_mem_dirmap_destroy(struct spi_mem_dirmap_desc *desc) if (!desc->nodirmap && ctlr->mem_ops && ctlr->mem_ops->dirmap_destroy) ctlr->mem_ops->dirmap_destroy(desc); + + kfree(desc); } EXPORT_SYMBOL_GPL(spi_mem_dirmap_destroy); |