drm/panel: Select DRM_DP_HELPER for DRM_PANEL_EDP

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

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 96d075e..80fa0ef 100644 (file)
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -369,7 +369,7 @@ static int bcm63xx_spi_transfer_one(struct spi_master *master,
                }
 
                /* CS will be deasserted directly after transfer */
-               if (t->delay_usecs || t->delay.value) {
+               if (t->delay.value) {
                        dev_err(&spi->dev, "unable to keep CS asserted after transfer\n");
                        status = -EINVAL;
                        goto exit;
@@ -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: