From: jun.li@nxp.com
To: peter.chen@nxp.com
Cc: gregkh@linuxfoundation.org, jun.li@nxp.com, linux-imx@nxp.com,
linux-usb@vger.kernel.org, dan.carpenter@oracle.com
Subject: [PATCH] usb: chipidea: imx: check data->usbmisc_data against NULL before access
Date: Wed, 9 Oct 2019 10:52:28 +0800 [thread overview]
Message-ID: <20191009025228.16595-1-jun.li@nxp.com> (raw)
From: Li Jun <jun.li@nxp.com>
As usbmisc_data is optional, so add the check before access its member,
this fix below static checker warning:
drivers/usb/chipidea/ci_hdrc_imx.c:438 ci_hdrc_imx_probe()
warn: 'data->usbmisc_data' can also be NULL
which is introduced by Patch 15b80f7c3a7f:
"usb: chipidea: imx: enable vbus and id wakeup only for OTG events"
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
---
drivers/usb/chipidea/ci_hdrc_imx.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index b11d70f..0498210 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -433,13 +433,15 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
goto err_clk;
}
- if (!IS_ERR(pdata.id_extcon.edev) ||
- of_property_read_bool(np, "usb-role-switch"))
- data->usbmisc_data->ext_id = 1;
-
- if (!IS_ERR(pdata.vbus_extcon.edev) ||
- of_property_read_bool(np, "usb-role-switch"))
- data->usbmisc_data->ext_vbus = 1;
+ if (data->usbmisc_data) {
+ if (!IS_ERR(pdata.id_extcon.edev) ||
+ of_property_read_bool(np, "usb-role-switch"))
+ data->usbmisc_data->ext_id = 1;
+
+ if (!IS_ERR(pdata.vbus_extcon.edev) ||
+ of_property_read_bool(np, "usb-role-switch"))
+ data->usbmisc_data->ext_vbus = 1;
+ }
ret = imx_usbmisc_init_post(data->usbmisc_data);
if (ret) {
--
2.7.4
next reply other threads:[~2019-10-09 3:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 2:52 jun.li [this message]
2019-10-09 8:17 ` [PATCH] usb: chipidea: imx: check data->usbmisc_data against NULL before access Peter Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191009025228.16595-1-jun.li@nxp.com \
--to=jun.li@nxp.com \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-imx@nxp.com \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).