diff options
| author | Baolin Wang <baolin.wang@linaro.org> | 2017-08-28 19:02:41 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-31 18:08:47 +0200 |
| commit | eb3c74de28b24f5a36d12d6c84f1fceb25d12c4f (patch) | |
| tree | eb30f865259f233e31169b04d5456afd9ebf5c8a /include | |
| parent | 06e74935c77e8605d7d825cd3762cad2c70578ed (diff) | |
| download | linux-eb3c74de28b24f5a36d12d6c84f1fceb25d12c4f.tar.gz | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/phy.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index de881b171ba9..8c6914873a16 100644 --- 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; } |