2021-11-25 07:59:16

by Tang Bin

Subject: [PATCH] ptp: ixp46x: Fix error handling in ptp_ixp_probe()

In the function ptp_ixp_probe(), when get irq failed
after executing platform_get_irq(), the negative value
returned will not be detected here. So fix error handling
in this place.

Fixes: 9055a2f591629 ("ixp4xx_eth: make ptp support a platform driver")
Signed-off-by: Tang Bin <[email protected]>
---
drivers/net/ethernet/xscale/ptp_ixp46x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/xscale/ptp_ixp46x.c b/drivers/net/ethernet/xscale/ptp_ixp46x.c
index 39234852e01b..c52e01d89e47 100644
--- a/drivers/net/ethernet/xscale/ptp_ixp46x.c
+++ b/drivers/net/ethernet/xscale/ptp_ixp46x.c
@@ -272,7 +272,7 @@ static int ptp_ixp_probe(struct platform_device *pdev)
ixp_clock.master_irq = platform_get_irq(pdev, 0);
ixp_clock.slave_irq = platform_get_irq(pdev, 1);
if (IS_ERR(ixp_clock.regs) ||
- !ixp_clock.master_irq || !ixp_clock.slave_irq)
+ (ixp_clock.master_irq < 0) || (ixp_clock.slave_irq < 0))
return -ENXIO;

ixp_clock.caps = ptp_ixp_caps;
--
2.18.2

2021-11-25 17:50:57

by Jakub Kicinski

Subject: Re: [PATCH] ptp: ixp46x: Fix error handling in ptp_ixp_probe()

On Thu, 25 Nov 2021 15:54:32 +0800 Tang Bin wrote:
> In the function ptp_ixp_probe(), when get irq failed
> after executing platform_get_irq(), the negative value
> returned will not be detected here. So fix error handling
> in this place.
>
> Fixes: 9055a2f591629 ("ixp4xx_eth: make ptp support a platform driver")
> Signed-off-by: Tang Bin <[email protected]>

Please resend this and CC the right people.

./scripts/get_maintainer.pl