From 3856c58e44b50df72d30ca13b83e97627a75ad9a Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 8 Sep 2017 15:38:07 -0700 Subject: [PATCH] Revert "mdio_bus: Remove unneeded gpiod NULL check" This reverts commit 52dc99edac9d3dc47fce7b214696bc1626284e2d ("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: 52dc99edac9d ("mdio_bus: Remove unneeded gpiod NULL check") Reported-by: Woojung Huh Signed-off-by: Florian Fainelli Signed-off-by: Linus Walleij Acked-by: Linus Walleij Signed-off-by: David S. Miller --- drivers/net/phy/mdio_bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index b6f9fa6701683..2df7b62c1a368 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -399,7 +399,8 @@ error: } /* 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); } -- 2.39.5