Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 928c75fb authored by LABBE Corentin's avatar LABBE Corentin Committed by Felipe Balbi
Browse files

usb: phy: msm: fix a possible NULL dereference 



of_match_device could return NULL, and so cause a NULL pointer
dereference later.
Even if the probability of this case is very low, fixing it made
static analyzers happy.
Solving this with of_device_get_match_data made also code simplier.

Reported-by: coverity (CID 1324133)
Signed-off-by: default avatarLABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 62e345ae

drivers/usb/phy/phy-msm-usb.c

+3 −3
Original line number Diff line number Diff line
@@ -1506,7 +1506,6 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg) 
{

	struct msm_otg_platform_data *pdata;

	struct extcon_dev *ext_id, *ext_vbus;

	const struct of_device_id *id;

	struct device_node *node = pdev->dev.of_node;

	struct property *prop;

	int len, ret, words;
@@ -1518,8 +1517,9 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg) 


	motg->pdata = pdata;



	id = of_match_device(msm_otg_dt_match, &pdev->dev);

	pdata->phy_type = (enum msm_usb_phy_type) id->data;

	pdata->phy_type = (enum msm_usb_phy_type)of_device_get_match_data(&pdev->dev);

	if (!pdata->phy_type)

		return 1;



	motg->link_rst = devm_reset_control_get(&pdev->dev, "link");

	if (IS_ERR(motg->link_rst))