power: supply: twl4030_charger: fix charging current out-of-bounds

[mirror_ubuntu-bionic-kernel.git] / drivers / power / supply / twl4030_charger.c

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index bbcaee56db9d743b6deb31adce88ee0b5379c56f..adcaa0a10a6f4b5d1dc17778dde025396edcdb8c 100644 (file)
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -420,7 +420,8 @@ static void twl4030_current_worker(struct work_struct *data)
 
        if (v < USB_MIN_VOLT) {
                /* Back up and stop adjusting. */
-               bci->usb_cur -= USB_CUR_STEP;
+               if (bci->usb_cur >= USB_CUR_STEP)
+                       bci->usb_cur -= USB_CUR_STEP;
                bci->usb_cur_target = bci->usb_cur;
        } else if (bci->usb_cur >= bci->usb_cur_target ||
                   bci->usb_cur + USB_CUR_STEP > USB_MAX_CURRENT) {
@@ -996,12 +997,13 @@ static int twl4030_bci_probe(struct platform_device *pdev)
        if (bci->dev->of_node) {
                struct device_node *phynode;
 
-               phynode = of_find_compatible_node(bci->dev->of_node->parent,
-                                                 NULL, "ti,twl4030-usb");
+               phynode = of_get_compatible_child(bci->dev->of_node->parent,
+                                                 "ti,twl4030-usb");
                if (phynode) {
                        bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
                        bci->transceiver = devm_usb_get_phy_by_node(
                                bci->dev, phynode, &bci->usb_nb);
+                       of_node_put(phynode);
                        if (IS_ERR(bci->transceiver)) {
                                ret = PTR_ERR(bci->transceiver);
                                if (ret == -EPROBE_DEFER)