Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751301AbdH1LDt (ORCPT ); Mon, 28 Aug 2017 07:03:49 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:36820 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751157AbdH1LDr (ORCPT ); Mon, 28 Aug 2017 07:03:47 -0400 From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, dan.carpenter@oracle.com, broonie@kernel.org, baolin.wang@linaro.org Subject: [PATCH] usb: phy: Avoid unchecked dereference warning Date: Mon, 28 Aug 2017 19:02:41 +0800 Message-Id: <7c740b51a4c307f655c4ae3003748329411313cb.1503917860.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 745 Lines: 28 Move the USB phy NULL checking before issuing usb_phy_set_charger_current() to avoid unchecked dereference warning. Signed-off-by: Baolin Wang --- include/linux/usb/phy.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index de881b1..8c69148 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; } -- 1.7.9.5