diff options
| author | Rohith Seelaboyina <rseelaboyina@nvidia.com> | 2013-12-12 08:52:31 +0530 |
|---|---|---|
| committer | Rohith Seelaboyina <rseelaboyina@nvidia.com> | 2013-12-12 08:52:31 +0530 |
| commit | 2574dd5fd19ff110b947e62af74da89cf45e0a14 (patch) | |
| tree | f47714e31fd067d71ddbac74cc7513bffa18eead /drivers/usb | |
| parent | ba8d73f84f4723c3429ca760f5f5c5163e96f1a7 (diff) | |
Revert "usb: gadget: otg: Allow device to charge in LP0"
This reverts commit ba8d73f84f4723c3429ca760f5f5c5163e96f1a7.
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/phy/tegra-otg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/phy/tegra-otg.c b/drivers/usb/phy/tegra-otg.c index 94e42bc486fd..7d9646ab9c6e 100644 --- a/drivers/usb/phy/tegra-otg.c +++ b/drivers/usb/phy/tegra-otg.c @@ -638,16 +638,16 @@ static int tegra_otg_conf(struct platform_device *pdev) tegra->phy.otg->set_peripheral = tegra_otg_set_peripheral; if (tegra->support_pmu_vbus) { - if (!pdata->ehci_pdata->vbus_extcon_dev_name) { + if (!pdata->vbus_extcon_dev_name) { dev_err(&pdev->dev, "Missing vbus_extcon_dev_name!\n"); err = -EINVAL; goto err_vbus_extcon; } - tegra->vbus_extcon_dev = extcon_get_extcon_dev(pdata-> - ehci_pdata->vbus_extcon_dev_name); + tegra->vbus_extcon_dev = + extcon_get_extcon_dev(pdata->vbus_extcon_dev_name); if (!tegra->vbus_extcon_dev) { dev_err(&pdev->dev, "Cannot get the %s extcon dev\n", - pdata->ehci_pdata->vbus_extcon_dev_name); + pdata->vbus_extcon_dev_name); err = -ENODEV; goto err_vbus_extcon; } @@ -656,16 +656,16 @@ static int tegra_otg_conf(struct platform_device *pdev) } if (tegra->support_pmu_id) { - if (!pdata->ehci_pdata->id_extcon_dev_name) { + if (!pdata->id_extcon_dev_name) { dev_err(&pdev->dev, "Missing id_extcon_dev_name!\n"); err = -EINVAL; goto err_id_extcon; } - tegra->id_extcon_dev = extcon_get_extcon_dev(pdata-> - ehci_pdata->id_extcon_dev_name); + tegra->id_extcon_dev = + extcon_get_extcon_dev(pdata->id_extcon_dev_name); if (!tegra->id_extcon_dev) { dev_err(&pdev->dev, "Cannot get the %s extcon dev\n", - pdata->ehci_pdata->id_extcon_dev_name); + pdata->id_extcon_dev_name); err = -ENODEV; goto err_id_extcon; } |