diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 10:51:21 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 10:51:21 +0200 |
| commit | 52d85ebb7b639448e596a8577bf981f5b139f4fd (patch) | |
| tree | 7632999ecf194b9863ad4a86533a91b9f78a28ce /drivers/spi/spi-ep93xx.c | |
| parent | Merge remote-tracking branch 'spi/topic/atmel' into spi-next (diff) | |
| parent | spi: spi-bfin5xx: replace platform_driver_probe to support deferred probing (diff) | |
| download | linux-52d85ebb7b639448e596a8577bf981f5b139f4fd.tar.xz linux-52d85ebb7b639448e596a8577bf981f5b139f4fd.zip | |
Merge remote-tracking branch 'spi/topic/bfin' into spi-next
Diffstat (limited to 'drivers/spi/spi-ep93xx.c')
| -rw-r--r-- | drivers/spi/spi-ep93xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c index b57a341d3e1c..1bfaed6e4073 100644 --- a/drivers/spi/spi-ep93xx.c +++ b/drivers/spi/spi-ep93xx.c @@ -942,7 +942,7 @@ static int ep93xx_spi_probe(struct platform_device *pdev) /* make sure that the hardware is disabled */ ep93xx_spi_write_u8(espi, SSPCR1, 0); - error = spi_register_master(master); + error = devm_spi_register_master(&pdev->dev, master); if (error) { dev_err(&pdev->dev, "failed to register SPI master\n"); goto fail_free_dma; @@ -968,7 +968,6 @@ static int ep93xx_spi_remove(struct platform_device *pdev) ep93xx_spi_release_dma(espi); - spi_unregister_master(master); return 0; } |