1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index ed4af4708d9a..2f7fd35a9ac8 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1407,7 +1407,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
         if (status < 0)
                 goto disable_pm;
 
-        status = spi_register_master(master);
+        status = devm_spi_register_master(&pdev->dev, master);
         if (status < 0)
                 goto disable_pm;
 
@@ -1435,7 +1435,6 @@ static int omap2_mcspi_remove(struct platform_device *pdev)
         pm_runtime_put_sync(mcspi->dev);
         pm_runtime_disable(&pdev->dev);
 
-        spi_unregister_master(master);
         kfree(dma_channels);
 
         return 0;