diff options
| author | Lukas Wunner <lukas@wunner.de> | 2020-12-07 09:17:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-07 14:18:55 +0000 |
| commit | a4729c3506c3eb1a6ca5c0289f4e7cafa4115065 (patch) | |
| tree | d3921188a3cf61dabdf5ba2404a431aa36840b51 /drivers/spi | |
| parent | 7174dc655ef0578877b0b4598e69619d2be28b4d (diff) | |
| download | linux-a4729c3506c3eb1a6ca5c0289f4e7cafa4115065.tar.gz linux-a4729c3506c3eb1a6ca5c0289f4e7cafa4115065.tar.bz2 linux-a4729c3506c3eb1a6ca5c0289f4e7cafa4115065.zip | |
spi: rb4xx: Don't leak SPI master in probe error path
If the calls to devm_clk_get(), devm_spi_register_master() or
clk_prepare_enable() fail on probe of the Mikrotik RB4xx SPI driver,
the spi_master struct is erroneously not freed.
Fix by switching over to the new devm_spi_alloc_master() helper.
Fixes: 05aec357871f ("spi: Add SPI driver for Mikrotik RB4xx series boards")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v4.2+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
Cc: <stable@vger.kernel.org> # v4.2+
Cc: Bert Vermeulen <bert@biot.com>
Link: https://lore.kernel.org/r/369bf26d71927f60943b1d9d8f51810f00b0237d.1607286887.git.lukas@wunner.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-rb4xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-rb4xx.c b/drivers/spi/spi-rb4xx.c index 8aa51beb4ff3..9f97d18a05c1 100644 --- a/drivers/spi/spi-rb4xx.c +++ b/drivers/spi/spi-rb4xx.c @@ -143,7 +143,7 @@ static int rb4xx_spi_probe(struct platform_device *pdev) if (IS_ERR(spi_base)) return PTR_ERR(spi_base); - master = spi_alloc_master(&pdev->dev, sizeof(*rbspi)); + master = devm_spi_alloc_master(&pdev->dev, sizeof(*rbspi)); if (!master) return -ENOMEM; |