From: Tomas Winkler <tomas.winkler@intel.com>
Date: Tue, 4 Jun 2024 09:07:28 +0000 (+0300)
Subject: mei: me: release irq in mei_me_pci_resume error path
X-Git-Tag: v6.10-rc4~7^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=283cb234ef95d94c61f59e1cd070cd9499b51292;p=thirdparty%2Fkernel%2Flinux.git

mei: me: release irq in mei_me_pci_resume error path

The mei_me_pci_resume doesn't release irq on the error path,
in case mei_start() fails.

Cc: <stable@kernel.org>
Fixes: 33ec08263147 ("mei: revamp mei reset state machine")
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20240604090728.1027307-1-tomas.winkler@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 7f59dd38c32f5..6589635f8ba32 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -385,8 +385,10 @@ static int mei_me_pci_resume(struct device *device)
 	}
 
 	err = mei_restart(dev);
-	if (err)
+	if (err) {
+		free_irq(pdev->irq, dev);
 		return err;
+	}
 
 	/* Start timer if stopped in suspend */
 	schedule_delayed_work(&dev->timer_work, HZ);