spi: meson-spicc: Fix error handling in meson_spicc_probe()
If devm_spi_register_master() fails in meson_spicc_probe(), spicc->core is left undisabled. The patch fixes that. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
0a090d6537
commit
ded5fa4e8b
|
@ -574,10 +574,15 @@ static int meson_spicc_probe(struct platform_device *pdev)
|
||||||
master->max_speed_hz = rate >> 2;
|
master->max_speed_hz = rate >> 2;
|
||||||
|
|
||||||
ret = devm_spi_register_master(&pdev->dev, master);
|
ret = devm_spi_register_master(&pdev->dev, master);
|
||||||
if (!ret)
|
if (ret) {
|
||||||
return 0;
|
dev_err(&pdev->dev, "spi master registration failed\n");
|
||||||
|
goto out_clk;
|
||||||
|
}
|
||||||
|
|
||||||
dev_err(&pdev->dev, "spi master registration failed\n");
|
return 0;
|
||||||
|
|
||||||
|
out_clk:
|
||||||
|
clk_disable_unprepare(spicc->core);
|
||||||
|
|
||||||
out_master:
|
out_master:
|
||||||
spi_master_put(master);
|
spi_master_put(master);
|
||||||
|
|
Loading…
Reference in New Issue