Merge branch 'rproc-fixes' into rproc-next

mathieupoirier · mathieupoirier · commit b30026f9ff31 · 2022-04-12T10:44:21.000-06:00
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
@@ -912,7 +912,6 @@ static int scp_remove(struct platform_device *pdev)
 	for (i = 0; i < SCP_IPI_MAX; i++)
 		mutex_destroy(&scp->ipi_desc[i].lock);
 	mutex_destroy(&scp->send_lock);
-	rproc_free(scp->rproc);
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -912,7 +912,6 @@ static int scp_remove(struct platform_device *pdev)`
`912`	`912`	`for (i = 0; i < SCP_IPI_MAX; i++)`
`913`	`913`	`mutex_destroy(&scp->ipi_desc[i].lock);`
`914`	`914`	`mutex_destroy(&scp->send_lock);`
`915`		`- rproc_free(scp->rproc);`
`916`	`915`
`917`	`916`	`return 0;`
`918`	`917`	`}`