projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7d5f880
3e2bd64
)
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
author
Mark Brown
<broonie@linaro.org>
Fri, 27 Sep 2013 13:27:56 +0000
(14:27 +0100)
committer
Mark Brown
<broonie@linaro.org>
Fri, 27 Sep 2013 13:27:56 +0000
(14:27 +0100)
Conflicts:
drivers/spi/spi-s3c64xx.c
1
2
drivers/spi/spi-s3c64xx.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/spi/spi-s3c64xx.c
index 84cc6ac801fedd529df90b0f67bf7d1b15280e66,a80376dc3a102d04684f27934a42412be3e851d7..229c6b994be351870a71443b7ee830c3d042efa5
---
1
/
drivers/spi/spi-s3c64xx.c
---
2
/
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);
- if (spi_register_master(master)) {
- dev_err(&pdev->dev, "cannot register SPI master\n");
- ret = -EBUSY;
+ pm_runtime_enable(&pdev->dev);
+
+ ret = devm_spi_register_master(&pdev->dev, master);
+ if (ret != 0) {
+ dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
goto err3;
}
This page took
0.027087 seconds
and
5
git commands to generate.