usb: phy: Avoid unchecked dereference warning

Move the USB phy NULL checking before issuing usb_phy_set_charger_current()
to avoid unchecked dereference warning.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index de881b171ba9b59dccf49bdfaa6497955b194aed..8c6914873a16a735b3ac26a6a1f69499ded12c73 100644 (file)
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -322,9 +322,12 @@ static inline void usb_phy_set_charger_state(struct usb_phy *usb_phy,
 static inline int
 usb_phy_set_power(struct usb_phy *x, unsigned mA)
 {
+       if (!x)
+               return 0;
+
        usb_phy_set_charger_current(x, mA);
 
-       if (x && x->set_power)
+       if (x->set_power)
                return x->set_power(x, mA);
        return 0;
 }