projects/linux·commit 332ec81d

Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus

332ec81d · Mark Brown <[email protected]> · 2013-06-24 12:28:29 +01:00

Commit
332ec81d413bd4e7375c25d628e7f658c37138f6
Parents
2f5a5c1b · 6c6cf64b

Merge commit. Changes below are compared with the first parent: 2f5a5c1b.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/spi/spi-s3c64xx.cmodified+1−1View file

drivers/spi/spi-s3c64xx.c

View file
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 5000586..71cc3e6 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;
}