X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=drivers%2Fspi%2Fspi-s3c64xx.c;h=8a2adf0e945284b4de1de1f5db0978063e1837da;hb=HEAD;hp=de7df20f8712dd74dc074e763555891f076b820f;hpb=baa35cc322c1f6c43506ee9a32c232b05a7eaa8c;p=mirror_ubuntu-bionic-kernel.git diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index de7df20f8712..8a2adf0e9452 100644 --- 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: