diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-03 11:54:30 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-03 11:54:30 -0300 |
| commit | 65f8d08cf838df3c3d728cdef908090237931496 (patch) | |
| tree | f4902ce189fc0304527eaf2ad29da2e88c2e9a6d /drivers/net/phy/fixed_phy.c | |
| parent | af2b24f228a0373ac65eb7a502e0bc31e2c0269d (diff) | |
| parent | c9e6606c7fe92b50a02ce51dda82586ebdf99b48 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/net/phy/fixed_phy.c')
| -rw-r--r-- | drivers/net/phy/fixed_phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index c65fb5f5d2dc..a0c256bd5441 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -239,8 +239,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, /* Check if we have a GPIO associated with this fixed phy */ if (!gpiod) { gpiod = fixed_phy_get_gpiod(np); - if (IS_ERR(gpiod)) - return ERR_CAST(gpiod); + if (!gpiod) + return ERR_PTR(-EINVAL); } /* Get the next available PHY address, up to PHY_MAX_ADDR */ |