Merge remote-tracking branches 'spi/topic/jcore', 'spi/topic/kconfig', 'spi/topic...

[linux-2.6-microblaze.git] / drivers / spi / spi-pxa2xx.c

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 713506e..82dcb88 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1806,6 +1806,8 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        return status;
 
 out_error_clock_enabled:
+       pm_runtime_put_noidle(&pdev->dev);
+       pm_runtime_disable(&pdev->dev);
        clk_disable_unprepare(ssp->clk);
        pxa2xx_spi_dma_release(drv_data);
        free_irq(ssp->irq, drv_data);