UBUNTU: Ubuntu-4.15.0-96.97

[mirror_ubuntu-bionic-kernel.git] / drivers / spi / spi-s3c64xx.c

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index de7df20f8712dd74dc074e763555891f076b820f..8a2adf0e945284b4de1de1f5db0978063e1837da 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1270,8 +1270,6 @@ static int s3c64xx_spi_resume(struct device *dev)
        if (ret < 0)
                return ret;
 
-       s3c64xx_spi_hwinit(sdd, sdd->port_id);
-
        return spi_master_resume(master);
 }
 #endif /* CONFIG_PM_SLEEP */
@@ -1309,6 +1307,8 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
        if (ret != 0)
                goto err_disable_src_clk;
 
+       s3c64xx_spi_hwinit(sdd, sdd->port_id);
+
        return 0;
 
 err_disable_src_clk: