diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2013-05-10 15:15:08 +0530 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-05-15 17:32:47 +0300 |
| commit | 1abd8b3172b701ed626df4ebf09b7fe7f329888a (patch) | |
| tree | e5edc969a6f01954507c3cf7224efa64e6f52f0d /drivers/usb | |
| parent | 9d6ab420a9cb475fb99874f06d00df9c8259c973 (diff) | |
| download | linux-3.10-1abd8b3172b701ed626df4ebf09b7fe7f329888a.tar.gz linux-3.10-1abd8b3172b701ed626df4ebf09b7fe7f329888a.tar.bz2 linux-3.10-1abd8b3172b701ed626df4ebf09b7fe7f329888a.zip | |
usb: phy: Fix NULL pointer exception during usb_get_phy
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.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/phy/phy-fsl-usb.c | 1 | ||||
| -rw-r--r-- | drivers/usb/phy/phy-gpio-vbus-usb.c | 1 | ||||
| -rw-r--r-- | drivers/usb/phy/phy-isp1301.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c index 97b9308507c..e771bafb9f1 100644 --- a/drivers/usb/phy/phy-fsl-usb.c +++ b/drivers/usb/phy/phy-fsl-usb.c @@ -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; diff --git a/drivers/usb/phy/phy-gpio-vbus-usb.c b/drivers/usb/phy/phy-gpio-vbus-usb.c index 1d32af2ee40..8443335c2ea 100644 --- a/drivers/usb/phy/phy-gpio-vbus-usb.c +++ b/drivers/usb/phy/phy-gpio-vbus-usb.c @@ -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; diff --git a/drivers/usb/phy/phy-isp1301.c b/drivers/usb/phy/phy-isp1301.c index 225ae6c97ee..8a55b37d1a0 100644 --- a/drivers/usb/phy/phy-isp1301.c +++ b/drivers/usb/phy/phy-isp1301.c @@ -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; |