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

This commit is contained in:
Mark Brown 2013-06-24 12:28:29 +01:00
commit 332ec81d41

View File

@ -444,7 +444,7 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi)
} }
ret = pm_runtime_get_sync(&sdd->pdev->dev); ret = pm_runtime_get_sync(&sdd->pdev->dev);
if (ret != 0) { if (ret < 0) {
dev_err(dev, "Failed to enable device: %d\n", ret); dev_err(dev, "Failed to enable device: %d\n", ret);
goto out_tx; goto out_tx;
} }