diff options
| author | Mark Brown | 2013-10-07 14:51:58 +0100 |
|---|---|---|
| committer | Mark Brown | 2013-10-07 14:51:58 +0100 |
| 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) 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: |