Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / spi / spi-s3c64xx.c

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 849ee82483e4b4715b92e65645543061586a3d5f..b392cca8fa4f5ba3c1c499ea8b1bc228fcabdbee 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -969,7 +969,7 @@ static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
                sci->num_cs = temp;
        }
 
-       sci->no_cs = of_property_read_bool(dev->of_node, "broken-cs");
+       sci->no_cs = of_property_read_bool(dev->of_node, "no-cs-readback");
 
        return sci;
 }
@@ -1147,7 +1147,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
                if (IS_ERR(sdd->tx_dma.ch)) {
                        dev_err(&pdev->dev, "Failed to get TX DMA channel\n");
                        ret = PTR_ERR(sdd->tx_dma.ch);
-                       goto err_release_tx_dma;
+                       goto err_release_rx_dma;
                }
        }
 
@@ -1196,11 +1196,11 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
        pm_runtime_disable(&pdev->dev);
        pm_runtime_set_suspended(&pdev->dev);
 
-       if (!is_polling(sdd))
-               dma_release_channel(sdd->rx_dma.ch);
-err_release_tx_dma:
        if (!is_polling(sdd))
                dma_release_channel(sdd->tx_dma.ch);
+err_release_rx_dma:
+       if (!is_polling(sdd))
+               dma_release_channel(sdd->rx_dma.ch);
 err_disable_io_clk:
        clk_disable_unprepare(sdd->ioclk);
 err_disable_src_clk: