Merge remote-tracking branch 'usb/usb-next'

[karo-tx-linux.git] / drivers / usb / phy / phy-ab8500-usb.c

diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 59cccfadae96c3fa92c18c90a4c3049e75c814be..7225d526df0446ff26fd69ef65268265737d8c66 100644 (file)
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -277,7 +277,7 @@ static void ab8500_usb_regulator_enable(struct ab8500_usb *ab)
                        dev_err(ab->dev, "Failed to set the Vintcore to 1.3V, ret=%d\n",
                                        ret);
 
-               ret = regulator_set_optimum_mode(ab->v_ulpi, 28000);
+               ret = regulator_set_load(ab->v_ulpi, 28000);
                if (ret < 0)
                        dev_err(ab->dev, "Failed to set optimum mode (ret=%d)\n",
                                        ret);
@@ -317,7 +317,7 @@ static void ab8500_usb_regulator_disable(struct ab8500_usb *ab)
                                                ab->saved_v_ulpi, ret);
                }
 
-               ret = regulator_set_optimum_mode(ab->v_ulpi, 0);
+               ret = regulator_set_load(ab->v_ulpi, 0);
                if (ret < 0)
                        dev_err(ab->dev, "Failed to set optimum mode (ret=%d)\n",
                                        ret);