diff options
| author | Lukas Wunner <lukas@wunner.de> | 2020-11-16 09:23:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-17 17:08:39 +0000 |
| commit | 04a9cd51d3f3308a98cbc6adc07acb12fbade011 (patch) | |
| tree | 9a8102f729452d30de9d0c068163d8dc6583ded8 | |
| parent | a41b0ad07bfa081584218431cb0cd7e7ecc71210 (diff) | |
| download | icc-04a9cd51d3f3308a98cbc6adc07acb12fbade011.tar.gz | |
spi: npcm-fiu: Don't leak SPI master in probe error path
If the calls to of_match_device(), of_alias_get_id(),
devm_ioremap_resource(), devm_regmap_init_mmio() or devm_clk_get()
fail on probe of the NPCM FIU SPI driver, the spi_controller struct is
erroneously not freed.
Fix by switching over to the new devm_spi_alloc_master() helper.
Fixes: ace55c411b11 ("spi: npcm-fiu: add NPCM FIU controller driver")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v5.4+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
Cc: <stable@vger.kernel.org> # v5.4+
Cc: Tomer Maimon <tmaimon77@gmail.com>
Link: https://lore.kernel.org/r/a420c23a363a3bc9aa684c6e790c32a8af106d17.1605512876.git.lukas@wunner.de
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/spi/spi-npcm-fiu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-npcm-fiu.c b/drivers/spi/spi-npcm-fiu.c index 341f7cffeaac6e..1cb9329de945e1 100644 --- a/drivers/spi/spi-npcm-fiu.c +++ b/drivers/spi/spi-npcm-fiu.c @@ -679,7 +679,7 @@ static int npcm_fiu_probe(struct platform_device *pdev) struct resource *res; int id; - ctrl = spi_alloc_master(dev, sizeof(*fiu)); + ctrl = devm_spi_alloc_master(dev, sizeof(*fiu)); if (!ctrl) return -ENOMEM; |