summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-24 12:28:29 +0100
committerMark Brown <broonie@linaro.org>2013-06-24 12:28:29 +0100
commit332ec81d413bd4e7375c25d628e7f658c37138f6 (patch)
treec4dc242a2161f38c4a45385cff2199400795e622 /drivers/spi
parent2f5a5c1be8b2eb1e2a1e77566a65d3c4f330d3c9 (diff)
parent6c6cf64b16438eac6da9a90412a82316ad196e7c (diff)
downloadlinux-3.10-332ec81d413bd4e7375c25d628e7f658c37138f6.tar.gz
linux-3.10-332ec81d413bd4e7375c25d628e7f658c37138f6.tar.bz2
linux-3.10-332ec81d413bd4e7375c25d628e7f658c37138f6.zip
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-s3c64xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 5000586cb98..71cc3e6ef47 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)
}
ret = pm_runtime_get_sync(&sdd->pdev->dev);
- if (ret != 0) {
+ if (ret < 0) {
dev_err(dev, "Failed to enable device: %d\n", ret);
goto out_tx;
}