diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-07 09:51:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-07 09:51:58 -0400 |
commit | 78e9fa521e4716f37bff3a44c29553147acb8321 (patch) | |
tree | 40b7657b9dee210e6861dacc276cf0db355bfce0 /drivers/spi | |
parent | 5acb8bb4412554db6346a4010c04e7e0f57324d0 (diff) | |
parent | 268d76430d1b68c340687357ffd18b4b12d02269 (diff) |
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) | |||
296 | goto error1; | 296 | goto error1; |
297 | } | 297 | } |
298 | 298 | ||
299 | pm_runtime_enable(&pdev->dev); | ||
300 | |||
299 | master->num_chipselect = 1; | 301 | master->num_chipselect = 1; |
300 | master->bus_num = pdev->id; | 302 | master->bus_num = pdev->id; |
301 | master->setup = hspi_setup; | 303 | master->setup = hspi_setup; |
@@ -309,8 +311,6 @@ static int hspi_probe(struct platform_device *pdev) | |||
309 | goto error1; | 311 | goto error1; |
310 | } | 312 | } |
311 | 313 | ||
312 | pm_runtime_enable(&pdev->dev); | ||
313 | |||
314 | return 0; | 314 | return 0; |
315 | 315 | ||
316 | error1: | 316 | error1: |