[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200414141423.4968-1-tangbin@cmss.chinamobile.com>
Date: Tue, 14 Apr 2020 22:14:24 +0800
From: Tang Bin <tangbin@...s.chinamobile.com>
To: minyard@....org, arnd@...db.de, gregkh@...uxfoundation.org
Cc: openipmi-developer@...ts.sourceforge.net,
linux-kernel@...r.kernel.org,
Tang Bin <tangbin@...s.chinamobile.com>,
Shengju Zhang <zhangshengju@...s.chinamobile.com>
Subject: [PATCH 3/3] ipmi:bt-bmc: Fix error handling and status check
If the function platform_get_irq() failed, the negative
value returned will not be detected here. So fix error
handling in bt_bmc_config_irq(). And if devm_request_irq()
failed, 'bt_bmc->irq' is assigned to zero maybe redundant,
it may be more suitable for using the correct negative values
to make the status check in the function bt_bmc_remove().
Signed-off-by: Tang Bin <tangbin@...s.chinamobile.com>
Signed-off-by: Shengju Zhang <zhangshengju@...s.chinamobile.com>
---
drivers/char/ipmi/bt-bmc.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
index 1d4bf5c65..1740c6dc8 100644
--- a/drivers/char/ipmi/bt-bmc.c
+++ b/drivers/char/ipmi/bt-bmc.c
@@ -399,16 +399,14 @@ static int bt_bmc_config_irq(struct bt_bmc *bt_bmc,
struct device *dev = &pdev->dev;
int rc;
- bt_bmc->irq = platform_get_irq(pdev, 0);
- if (!bt_bmc->irq)
- return -ENODEV;
+ bt_bmc->irq = platform_get_irq_optional(pdev, 0);
+ if (bt_bmc->irq < 0)
+ return bt_bmc->irq;
rc = devm_request_irq(dev, bt_bmc->irq, bt_bmc_irq, IRQF_SHARED,
DEVICE_NAME, bt_bmc);
- if (rc < 0) {
- bt_bmc->irq = 0;
+ if (rc < 0)
return rc;
- }
/*
* Configure IRQs on the bmc clearing the H2B and HBUSY bits;
@@ -499,7 +497,7 @@ static int bt_bmc_remove(struct platform_device *pdev)
struct bt_bmc *bt_bmc = dev_get_drvdata(&pdev->dev);
misc_deregister(&bt_bmc->miscdev);
- if (!bt_bmc->irq)
+ if (bt_bmc->irq < 0)
del_timer_sync(&bt_bmc->poll_timer);
return 0;
}
--
2.20.1.windows.1
Powered by blists - more mailing lists