spi: omap2-mcspi: Correctly handle devm_clk_get_optional() errors

devm_clk_get_optional() returns NULL for missing clocks and a PTR_ERR()
if there is a clock but we fail to get it, but currently we only handle
the latter case and do so as though the clock was missing.  If we get an
error back we should handle that as an error since the clock exists but
we failed to get it, if we get NULL then the clock doesn't exist and we
should handle that.

Fixes: 4c6ac5446d06 ("spi: omap2-mcspi: Fix the IS_ERR() bug for devm_clk_get_optional_enabled()")
Reported-by: Lars Pedersen <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Mark Brown <[email protected]>
Tested-by: Lars Pedersen <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index add6247d348190452918900b145c3c5a00e409b3..29c616e2c408cf26b150a853f789128d003db1f0 100644 (file)
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1561,10 +1561,15 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
        }
 
        mcspi->ref_clk = devm_clk_get_optional_enabled(&pdev->dev, NULL);
-       if (IS_ERR(mcspi->ref_clk))
-               mcspi->ref_clk_hz = OMAP2_MCSPI_MAX_FREQ;
-       else
+       if (IS_ERR(mcspi->ref_clk)) {
+               status = PTR_ERR(mcspi->ref_clk);
+               dev_err_probe(&pdev->dev, status, "Failed to get ref_clk");
+               goto free_ctlr;
+       }
+       if (mcspi->ref_clk)
                mcspi->ref_clk_hz = clk_get_rate(mcspi->ref_clk);
+       else
+               mcspi->ref_clk_hz = OMAP2_MCSPI_MAX_FREQ;
        ctlr->max_speed_hz = mcspi->ref_clk_hz;
        ctlr->min_speed_hz = mcspi->ref_clk_hz >> 15;