1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 231b84523d37..c74ee87b243b 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -1164,7 +1164,7 @@ static int tegra_slink_probe(struct platform_device *pdev)
         pm_runtime_put(&pdev->dev);
 
         master->dev.of_node = pdev->dev.of_node;
-        ret = spi_register_master(master);
+        ret = devm_spi_register_master(&pdev->dev, master);
         if (ret < 0) {
                 dev_err(&pdev->dev, "can not register to master err %d\n", ret);
                 goto exit_pm_disable;
@@ -1191,7 +1191,6 @@ static int tegra_slink_remove(struct platform_device *pdev)
         struct tegra_slink_data *tspi = spi_master_get_devdata(master);
 
         free_irq(tspi->irq, tspi);
-        spi_unregister_master(master);
 
         if (tspi->tx_dma_chan)
                 tegra_slink_deinit_dma_param(tspi, false);