diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-24 07:28:29 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-24 07:28:29 -0400 |
| commit | 332ec81d413bd4e7375c25d628e7f658c37138f6 (patch) | |
| tree | c4dc242a2161f38c4a45385cff2199400795e622 /drivers/spi | |
| parent | 2f5a5c1be8b2eb1e2a1e77566a65d3c4f330d3c9 (diff) | |
| parent | 6c6cf64b16438eac6da9a90412a82316ad196e7c (diff) | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 5000586cb98d..71cc3e6ef47c 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
| @@ -444,7 +444,7 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi) | |||
| 444 | } | 444 | } |
| 445 | 445 | ||
| 446 | ret = pm_runtime_get_sync(&sdd->pdev->dev); | 446 | ret = pm_runtime_get_sync(&sdd->pdev->dev); |
| 447 | if (ret != 0) { | 447 | if (ret < 0) { |
| 448 | dev_err(dev, "Failed to enable device: %d\n", ret); | 448 | dev_err(dev, "Failed to enable device: %d\n", ret); |
| 449 | goto out_tx; | 449 | goto out_tx; |
| 450 | } | 450 | } |