Commit a010a2f6 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

Revert "mdio_bus: Remove unneeded gpiod NULL check"

This reverts commit 95b80bf3 ("mdio_bus:
Remove unneeded gpiod NULL check"), this commit assumed that GPIOLIB
checks for NULL descriptors, so it's safe to drop them, but it is not
when CONFIG_GPIOLIB is disabled in the kernel. If we do call
gpiod_set_value_cansleep() on a GPIO descriptor we will issue warnings
coming from the inline stubs declared in include/linux/gpio/consumer.h.

Fixes: 95b80bf3 ("mdio_bus: Remove unneeded gpiod NULL check")
Reported-by: default avatarWoojung Huh <[email protected]>
Signed-off-by: default avatarFlorian Fainelli <[email protected]>
Signed-off-by: default avatarLinus Walleij <[email protected]>
Acked-by: default avatarLinus Walleij <[email protected]>
Signed-off-by: default avatarDavid S. Miller <[email protected]>
parent a7bc5774
......@@ -399,7 +399,8 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
}
/* Put PHYs in RESET to save power */
gpiod_set_value_cansleep(bus->reset_gpiod, 1);
if (bus->reset_gpiod)
gpiod_set_value_cansleep(bus->reset_gpiod, 1);
device_del(&bus->dev);
return err;
......@@ -424,7 +425,8 @@ void mdiobus_unregister(struct mii_bus *bus)
}
/* Put PHYs in RESET to save power */
gpiod_set_value_cansleep(bus->reset_gpiod, 1);
if (bus->reset_gpiod)
gpiod_set_value_cansleep(bus->reset_gpiod, 1);
device_del(&bus->dev);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment