spi: bcm63xx-spi: fix pm_runtime
authorÁlvaro Fernández Rojas <noltari@gmail.com>
Tue, 23 Feb 2021 15:18:50 +0000 (16:18 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 10 Mar 2021 12:25:10 +0000 (12:25 +0000)
The driver sets auto_runtime_pm to true, but it doesn't call
pm_runtime_enable(), which results in "Failed to power device" when PM support
is enabled.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Link: https://lore.kernel.org/r/20210223151851.4110-2-noltari@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-bcm63xx.c

index 96d075e633f4320db621d174976ed431b90ff847..d08bb7600150ccf426fa56fca64d5682fc22a3e8 100644 (file)
@@ -593,11 +593,13 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
 
        bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS);
 
+       pm_runtime_enable(&pdev->dev);
+
        /* register and we are done */
        ret = devm_spi_register_master(dev, master);
        if (ret) {
                dev_err(dev, "spi register failed\n");
-               goto out_clk_disable;
+               goto out_pm_disable;
        }
 
        dev_info(dev, "at %pr (irq %d, FIFOs size %d)\n",
@@ -605,6 +607,8 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
 
        return 0;
 
+out_pm_disable:
+       pm_runtime_disable(&pdev->dev);
 out_clk_disable:
        clk_disable_unprepare(clk);
 out_err: