]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
apple-nvme: Release power domains when probe fails
authorHector Martin <marcan@marcan.st>
Thu, 13 Feb 2025 16:12:59 +0000 (11:12 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Mar 2025 19:54:19 +0000 (12:54 -0700)
[ Upstream commit eefa72a15ea03fd009333aaa9f0e360b2578e434 ]

Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Reviewed-by: Sven Peter <sven@svenpeter.dev>
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvme/host/apple.c

index b1387dc459a323524a075ddee8a382b372ba06ba..df054cd38c3e36771f6faa61fc936cd0396d3e2b 100644 (file)
@@ -1518,6 +1518,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);
 }
@@ -1551,6 +1552,7 @@ out_uninit_ctrl:
        nvme_uninit_ctrl(&anv->ctrl);
 out_put_ctrl:
        nvme_put_ctrl(&anv->ctrl);
+       apple_nvme_detach_genpd(anv);
        return ret;
 }