]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: pcs: xpcs: Return EINVAL in the internal methods
authorSerge Semin <fancer.lancer@gmail.com>
Thu, 22 Feb 2024 17:58:22 +0000 (20:58 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Apr 2024 11:10:00 +0000 (13:10 +0200)
[ Upstream commit f5151005d379d9ce42e327fd3b2d2aaef61cda81 ]

In particular the xpcs_soft_reset() and xpcs_do_config() functions
currently return -1 if invalid auto-negotiation mode is specified. That
value might be then passed to the generic kernel subsystems which require
a standard kernel errno value. Even though the erroneous conditions are
very specific (memory corruption or buggy driver implementation) using a
hard-coded -1 literal doesn't seem correct anyway especially when it comes
to passing it higher to the network subsystem or printing to the system
log.  Convert the hard-coded error values to -EINVAL then.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/pcs/pcs-xpcs.c

index 31f0beba638a2d67b716fda58d4d3cdefcd8fd19..03d6a6aef77cdc2267b5c42aa57f3e34d066ea6a 100644 (file)
@@ -293,7 +293,7 @@ static int xpcs_soft_reset(struct dw_xpcs *xpcs,
                dev = MDIO_MMD_VEND2;
                break;
        default:
-               return -1;
+               return -EINVAL;
        }
 
        ret = xpcs_write(xpcs, dev, MDIO_CTRL1, MDIO_CTRL1_RESET);
@@ -891,7 +891,7 @@ int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,
                        return ret;
                break;
        default:
-               return -1;
+               return -EINVAL;
        }
 
        if (compat->pma_config) {