[PATCH] usb: chipidea: imx: check data->usbmisc_data against NULL before access

[PATCH] usb: chipidea: imx: check data->usbmisc_data against NULL before access

[jun.li]

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

Re: [PATCH] usb: chipidea: imx: check data->usbmisc_data against NULL before access

[Peter Chen]

On 19-10-09 10:52:28, jun.li@nxp.com wrote:
> 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) {

Applied, thanks.

-- 

Thanks,
Peter Chen