Skip to contentSkip to conversation

usb: phy: Fix NULL pointer exception during usb_get_phy

PATCH New Kishon Vijay Abraham I 1 participant 1 message May 10, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: phy: Fix NULL pointer exception during usb_get_phy

From: Robert Jarzmik <[email protected]>

Upon initialisation (driver probe) a NULL pointer exception is triggered. This is due to lack of initialisation of device field in phy structure, which is used by phy framework in usb_get_phy().

Fix it by initialising the device field.

---
 drivers/usb/phy/phy-fsl-usb.c       |    1 +
 drivers/usb/phy/phy-gpio-vbus-usb.c |    1 +
 drivers/usb/phy/phy-isp1301.c       |    1 +
 3 files changed, 3 insertions(+)
drivers/usb/phy/phy-fsl-usb.c +1 -0
index 97b9308..e771baf 100644
@@ -799,6 +799,7 @@ static int fsl_otg_conf(struct platform_device *pdev)
 
 	/* initialize the otg structure */
 	fsl_otg_tc->phy.label = DRIVER_DESC;
+	fsl_otg_tc->phy.dev = &pdev->dev;
 	fsl_otg_tc->phy.set_power = fsl_otg_set_power;
 
 	fsl_otg_tc->phy.otg->phy = &fsl_otg_tc->phy;
drivers/usb/phy/phy-gpio-vbus-usb.c +1 -0
index 4c76074..e014b38 100644
@@ -266,6 +266,7 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, gpio_vbus);
 	gpio_vbus->dev = &pdev->dev;
 	gpio_vbus->phy.label = "gpio-vbus";
+	gpio_vbus->phy.dev = gpio_vbus->dev;
 	gpio_vbus->phy.set_power = gpio_vbus_set_power;
 	gpio_vbus->phy.set_suspend = gpio_vbus_set_suspend;
 	gpio_vbus->phy.state = OTG_STATE_UNDEFINED;
drivers/usb/phy/phy-isp1301.c +1 -0
index 225ae6c..8a55b37 100644
@@ -102,6 +102,7 @@ static int isp1301_probe(struct i2c_client *client,
 	mutex_init(&isp->mutex);
 
 	phy = &isp->phy;
+	phy->dev = &client->dev;
 	phy->label = DRV_NAME;
 	phy->init = isp1301_phy_init;
 	phy->set_vbus = isp1301_phy_set_vbus;
Signature · 1 line
1.7.10.4