apple-nvme: Release power domains when probe fails

marcan · jannau · commit d9bf51f2a1be · 2024-09-16T10:22:54.000+02:00
Signed-off-by: Hector Martin &lt;marcan@marcan.st&gt;
diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
@@ -1578,6 +1578,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);
 }
@@ -1619,6 +1620,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
`@@ -1578,6 +1578,7 @@ static struct apple_nvme apple_nvme_alloc(struct platform_device pdev)`
`1578`	`1578`
`1579`	`1579`	`return anv;`
`1580`	`1580`	`put_dev:`
	`1581`	`+ apple_nvme_detach_genpd(anv);`
`1581`	`1582`	`put_device(anv->dev);`
`1582`	`1583`	`return ERR_PTR(ret);`
`1583`	`1584`	`}`
`@@ -1619,6 +1620,7 @@ static int apple_nvme_probe(struct platform_device *pdev)`
`1619`	`1620`	`nvme_uninit_ctrl(&anv->ctrl);`
`1620`	`1621`	`out_put_ctrl:`
`1621`	`1622`	`nvme_put_ctrl(&anv->ctrl);`
	`1623`	`+ apple_nvme_detach_genpd(anv);`
`1622`	`1624`	`return ret;`
`1623`	`1625`	`}`
`1624`	`1626`