diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 00c32320dce87c0adb66eca0eef65e9d2c417e2c..49ae72a93087a15ab9c4b08e0a17f51d8d9360dc 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);