Re: [PATCH] net: systemport: Add and correct check for platform_get_irq

On Thu, Jun 01, 2023 at 06:42:26AM +0800, Justin Chen wrote:

On 5/31/23 2:11 AM, Jiasheng Jiang wrote:

quoted

Add the missing check for "priv->wol_irq".
Use "<" instead of "<=" to check the irqs since the platform_get_irq
returns non-zero IRQ number on success and negative error number on
failure, shown in `driver/base/platform.c`.

Fixes: 83e82f4c706b ("net: systemport: add Wake-on-LAN support")
Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
Signed-off-by: Jiasheng Jiang <redacted>
---
  drivers/net/ethernet/broadcom/bcmsysport.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
index 38d0cdaf22a5..16c9c0be1a33 100644
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c

@@ -2535,7 +2535,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
  	} else {
  		priv->wol_irq = platform_get_irq(pdev, 1);
  	}
-	if (priv->irq0 <= 0 || (priv->irq1 <= 0 && !priv->is_lite)) {
+	if (priv->irq0 < 0 || (priv->irq1 < 0 && !priv->is_lite) || priv->wol_irq < 0) {
  		ret = -EINVAL;
  		goto err_free_netdev;
  	}

wol_irq is optional so we don't want to error out. Guess we should 
probably replace platform_get_irq with platform_get_irq_optional(). "<=" 
is fine. As you mentioned, a non-zero is success, so zero is considered 
invalid.

Yes, you are right.
I will submit a new patch that replace platform_get_irq with
platform_get_irq_optional.

Thanks,
Jiasheng