apple-nvme: Release power domains when probe fails

marcan · keithbusch · commit eefa72a15ea0 · 2025-02-18T07:41:10.000-08:00
Signed-off-by: Hector Martin &lt;marcan@marcan.st&gt;
Reviewed-by: Neal Gompa &lt;neal@gompa.dev&gt;
Reviewed-by: Sven Peter &lt;sven@svenpeter.dev&gt;
Signed-off-by: Alyssa Rosenzweig &lt;alyssa@rosenzweig.io&gt;
Signed-off-by: Keith Busch &lt;kbusch@kernel.org&gt;
diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
@@ -1516,6 +1516,7 @@ static struct apple_nvme *apple_nvme_alloc(struct platform_device *pdev)
 
 	return anv;
 put_dev:
+	apple_nvme_detach_genpd(anv);
 	put_device(anv->dev);
 	return ERR_PTR(ret);
 }
@@ -1549,6 +1550,7 @@ static int apple_nvme_probe(struct platform_device *pdev)
 	nvme_uninit_ctrl(&anv->ctrl);
 out_put_ctrl:
 	nvme_put_ctrl(&anv->ctrl);
+	apple_nvme_detach_genpd(anv);
 	return ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1516,6 +1516,7 @@ static struct apple_nvme apple_nvme_alloc(struct platform_device pdev)`
`1516`	`1516`
`1517`	`1517`	`return anv;`
`1518`	`1518`	`put_dev:`
	`1519`	`+ apple_nvme_detach_genpd(anv);`
`1519`	`1520`	`put_device(anv->dev);`
`1520`	`1521`	`return ERR_PTR(ret);`
`1521`	`1522`	`}`
`@@ -1549,6 +1550,7 @@ static int apple_nvme_probe(struct platform_device *pdev)`
`1549`	`1550`	`nvme_uninit_ctrl(&anv->ctrl);`
`1550`	`1551`	`out_put_ctrl:`
`1551`	`1552`	`nvme_put_ctrl(&anv->ctrl);`
	`1553`	`+ apple_nvme_detach_genpd(anv);`
`1552`	`1554`	`return ret;`
`1553`	`1555`	`}`
`1554`	`1556`