diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 15:51:58 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 15:51:58 +0200 |
| commit | 78e9fa521e4716f37bff3a44c29553147acb8321 (patch) | |
| tree | 40b7657b9dee210e6861dacc276cf0db355bfce0 /drivers/spi | |
| parent | Merge remote-tracking branch 'spi/fix/dspi' into spi-linus (diff) | |
| parent | spi/hspi: fixup Runtime PM enable timing (diff) | |
| download | linux-78e9fa521e4716f37bff3a44c29553147acb8321.tar.xz linux-78e9fa521e4716f37bff3a44c29553147acb8321.zip | |
Merge remote-tracking branch 'spi/fix/hspi' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sh-hspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c index 0b68cb592fa4..e488a90a98b8 100644 --- a/drivers/spi/spi-sh-hspi.c +++ b/drivers/spi/spi-sh-hspi.c @@ -296,6 +296,8 @@ static int hspi_probe(struct platform_device *pdev) goto error1; } + pm_runtime_enable(&pdev->dev); + master->num_chipselect = 1; master->bus_num = pdev->id; master->setup = hspi_setup; @@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev) goto error1; } - pm_runtime_enable(&pdev->dev); - return 0; error1: |