Skip to content

Commit ef3d549

Browse files
outman119broonie
authored andcommitted
spi: sn-f-ospi: Fix resource leak in f_ospi_probe()
In f_ospi_probe(), when num_cs validation fails, it returns without calling spi_controller_put() on the SPI controller, which causes a resource leak. Use devm_spi_alloc_host() instead of spi_alloc_host() to ensure the SPI controller is properly freed when probe fails. Fixes: 1b74dd6 ("spi: Add Socionext F_OSPI SPI flash controller driver") Signed-off-by: Felix Gu <ustc.gu@gmail.com> Link: https://patch.msgid.link/20260319-sn-f-v1-1-33a6738d2da8@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent c369299 commit ef3d549

1 file changed

Lines changed: 5 additions & 12 deletions

File tree

drivers/spi/spi-sn-f-ospi.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ static int f_ospi_probe(struct platform_device *pdev)
612612
u32 num_cs = OSPI_NUM_CS;
613613
int ret;
614614

615-
ctlr = spi_alloc_host(dev, sizeof(*ospi));
615+
ctlr = devm_spi_alloc_host(dev, sizeof(*ospi));
616616
if (!ctlr)
617617
return -ENOMEM;
618618

@@ -635,16 +635,12 @@ static int f_ospi_probe(struct platform_device *pdev)
635635
platform_set_drvdata(pdev, ospi);
636636

637637
ospi->base = devm_platform_ioremap_resource(pdev, 0);
638-
if (IS_ERR(ospi->base)) {
639-
ret = PTR_ERR(ospi->base);
640-
goto err_put_ctlr;
641-
}
638+
if (IS_ERR(ospi->base))
639+
return PTR_ERR(ospi->base);
642640

643641
ospi->clk = devm_clk_get_enabled(dev, NULL);
644-
if (IS_ERR(ospi->clk)) {
645-
ret = PTR_ERR(ospi->clk);
646-
goto err_put_ctlr;
647-
}
642+
if (IS_ERR(ospi->clk))
643+
return PTR_ERR(ospi->clk);
648644

649645
mutex_init(&ospi->mlock);
650646

@@ -661,9 +657,6 @@ static int f_ospi_probe(struct platform_device *pdev)
661657
err_destroy_mutex:
662658
mutex_destroy(&ospi->mlock);
663659

664-
err_put_ctlr:
665-
spi_controller_put(ctlr);
666-
667660
return ret;
668661
}
669662

0 commit comments

Comments
 (0)