diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
| commit | d6fa4ec20db6bd0b403d2d99fd9423e6c0f3f845 (patch) | |
| tree | e9ddb16309d2b546a400593afc07846ce9ed6746 /drivers/usb/otg | |
| parent | dc1cfc34b2a07c5441d68ca21ae4296822ee4df6 (diff) | |
| parent | 1ff6b9489fbc737e3e2bc7660b92cebbfaea5247 (diff) | |
Conflicts:
arch/arm/mach-tegra/common.c
drivers/ata/ahci-tegra.c
Diffstat (limited to 'drivers/usb/otg')
| -rw-r--r-- | drivers/usb/otg/tegra-otg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/otg/tegra-otg.c b/drivers/usb/otg/tegra-otg.c index 22e303ede24e..12c359bcbe46 100644 --- a/drivers/usb/otg/tegra-otg.c +++ b/drivers/usb/otg/tegra-otg.c @@ -173,8 +173,6 @@ static void tegra_stop_host(struct tegra_otg_data *tegra) if (pdev) { /* unregister host from otg */ - kfree(pdev->dev.platform_data); - pdev->dev.platform_data = NULL; platform_device_unregister(pdev); tegra->pdev = NULL; } @@ -472,12 +470,14 @@ static int tegra_otg_probe(struct platform_device *pdev) goto err_irq; } - err = enable_irq_wake(tegra->irq); - if (err < 0) { - dev_warn(&pdev->dev, - "Couldn't enable USB otg mode wakeup, irq=%d, error=%d\n", - tegra->irq, err); - err = 0; + if (pdata->ehci_pdata->u_data.host.remote_wakeup_supported) { + err = enable_irq_wake(tegra->irq); + if (err < 0) { + dev_warn(&pdev->dev, + "Couldn't enable USB otg mode wakeup," + " irq=%d, error=%d\n", tegra->irq, err); + err = 0; + } } INIT_WORK(&tegra->work, irq_work); |