diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 57de139f76dcc8a08f984f85e089b130dc11aa1a..8719206a03a00e59a7dea523afe7f6c841745d50 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -726,7 +726,7 @@ static void rspi_release_dma(struct rspi_data *rspi)
 
 static int rspi_remove(struct platform_device *pdev)
 {
-	struct rspi_data *rspi = platform_get_drvdata(pdev);
+	struct rspi_data *rspi = spi_master_get(platform_get_drvdata(pdev));
 
 	spi_unregister_master(rspi->master);
 	rspi_release_dma(rspi);