Merge tag 'v5.2' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index f46086fa9064..db91b213eae1 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -436,9 +436,9 @@ int ksz_switch_register(struct ksz_device *dev,
                 return PTR_ERR(dev->reset_gpio);
 
         if (dev->reset_gpio) {
-                gpiod_set_value(dev->reset_gpio, 1);
+                gpiod_set_value_cansleep(dev->reset_gpio, 1);
                 mdelay(10);
-                gpiod_set_value(dev->reset_gpio, 0);
+                gpiod_set_value_cansleep(dev->reset_gpio, 0);
         }
 
         mutex_init(&dev->dev_mutex);
@@ -487,7 +487,7 @@ void ksz_switch_remove(struct ksz_device *dev)
         dsa_unregister_switch(dev->ds);
 
         if (dev->reset_gpio)
-                gpiod_set_value(dev->reset_gpio, 1);
+                gpiod_set_value_cansleep(dev->reset_gpio, 1);
 
 }
 EXPORT_SYMBOL(ksz_switch_remove);