diff options
| author | Lukas Wunner | 2020-11-08 16:41:00 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2020-12-29 06:47:09 -0600 |
| commit | 140c30462c6f0d4a9bb33303becb94939b60c5a4 (patch) | |
| tree | c5f1dc5fe35759282dfec2d724f912e4dc06ca1d | |
| parent | 631aae36f0a7fe244a97aca0a466bb7f6db57d5e (diff) | |
| download | kernel-140c30462c6f0d4a9bb33303becb94939b60c5a4.tar.gz kernel-140c30462c6f0d4a9bb33303becb94939b60c5a4.tar.xz kernel-140c30462c6f0d4a9bb33303becb94939b60c5a4.zip | |
spi: pic32: Don't leak DMA channels in probe error path
commit c575e9113bff5e024d75481613faed5ef9d465b2 upstream.
If the calls to devm_request_irq() or devm_spi_register_master() fail
on probe of the PIC32 SPI driver, the DMA channels requested by
pic32_spi_dma_prep() are erroneously not released. Plug the leak.
Fixes: 1bcb9f8ceb67 ("spi: spi-pic32: Add PIC32 SPI master driver")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v4.7+
Cc: Purna Chandra Mandal <purna.mandal@microchip.com>
Link: https://lore.kernel.org/r/9624250e3a7aa61274b38219a62375bac1def637.1604874488.git.lukas@wunner.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/spi/spi-pic32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c index 288002f6c613..661a40c653e9 100644 --- a/drivers/spi/spi-pic32.c +++ b/drivers/spi/spi-pic32.c | |||
| @@ -839,6 +839,7 @@ static int pic32_spi_probe(struct platform_device *pdev) | |||
| 839 | return 0; | 839 | return 0; |
| 840 | 840 | ||
| 841 | err_bailout: | 841 | err_bailout: |
| 842 | pic32_spi_dma_unprep(pic32s); | ||
| 842 | clk_disable_unprepare(pic32s->clk); | 843 | clk_disable_unprepare(pic32s->clk); |
| 843 | err_master: | 844 | err_master: |
| 844 | spi_master_put(master); | 845 | spi_master_put(master); |