]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: sh-msiof: Add runtime PM lock in initializing
authorHisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Mon, 15 Dec 2014 14:01:11 +0000 (23:01 +0900)
committerLuis Henriques <luis.henriques@canonical.com>
Thu, 15 Jan 2015 22:41:19 +0000 (22:41 +0000)
commit 015760563ec77bf17cec712fa94afdf53b285287 upstream.

SH-MSIOF driver is enabled autosuspend API of spi framework.
But autosuspend framework doesn't work during initializing.
So runtime PM lock is added in SH-MSIOF driver initializing.

Fixes: e2a0ba547ba31c (spi: sh-msiof: Convert to spi core auto_runtime_pm framework)
Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/spi/spi-sh-msiof.c

index 45b09142afe2defcd6be0ed9d0f9a7ea7aa1fc15..7f0f2ebf3cdca9422caf40de489a50ee8f732f82 100644 (file)
@@ -421,6 +421,8 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
        struct device_node      *np = spi->master->dev.of_node;
        struct sh_msiof_spi_priv *p = spi_master_get_devdata(spi->master);
 
+       pm_runtime_get_sync(&p->pdev->dev);
+
        if (!np) {
                /*
                 * Use spi->controller_data for CS (same strategy as spi_gpio),
@@ -439,6 +441,9 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
        if (spi->cs_gpio >= 0)
                gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
 
+
+       pm_runtime_put_sync(&p->pdev->dev);
+
        return 0;
 }