From: Mark Brown <broonie@linaro.org>
Date: Fri, 27 Sep 2013 13:27:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0cab71e7014dc73a84e1d14d9b02e39c48241580;p=deliverable%2Flinux.git

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

Conflicts:
	drivers/spi/spi-s3c64xx.c
---

0cab71e7014dc73a84e1d14d9b02e39c48241580
diff --cc drivers/spi/spi-s3c64xx.c
index 84cc6ac801fe,a80376dc3a10..229c6b994be3
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@@ -1428,9 -1428,11 +1428,11 @@@ static int s3c64xx_spi_probe(struct pla
  	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
  	       sdd->regs + S3C64XX_SPI_INT_EN);
  
+ 	pm_runtime_enable(&pdev->dev);
+ 
 -	if (spi_register_master(master)) {
 -		dev_err(&pdev->dev, "cannot register SPI master\n");
 -		ret = -EBUSY;
 +	ret = devm_spi_register_master(&pdev->dev, master);
 +	if (ret != 0) {
 +		dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
  		goto err3;
  	}