| commit | 78e9fa521e4716f37bff3a44c29553147acb8321 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Mon Oct 07 14:51:58 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Mon Oct 07 14:51:58 2013 +0100 |
| tree | 40b7657b9dee210e6861dacc276cf0db355bfce0 | |
| parent | 5acb8bb4412554db6346a4010c04e7e0f57324d0 [diff] | |
| parent | 268d76430d1b68c340687357ffd18b4b12d02269 [diff] |
Merge remote-tracking branch 'spi/fix/hspi' into spi-linus
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c index 0b68cb5..e488a90 100644 --- a/drivers/spi/spi-sh-hspi.c +++ b/drivers/spi/spi-sh-hspi.c
@@ -296,6 +296,8 @@ goto error1; } + pm_runtime_enable(&pdev->dev); + master->num_chipselect = 1; master->bus_num = pdev->id; master->setup = hspi_setup; @@ -309,8 +311,6 @@ goto error1; } - pm_runtime_enable(&pdev->dev); - return 0; error1: