summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2010-06-08 15:35:29 -0700
committerGary King <gking@nvidia.com>2010-06-08 21:17:56 -0700
commit5f3b2546788a3f9927470ed20684b01cfc875d80 (patch)
tree52e44196dbc5f89d8ec38189113472307337166d
parent3bacaf52fbdfb22f8ddbc76f3578183140ff2a07 (diff)
ehci-tegra: do not request_mem_region for OTG controllerstegra-9.12.13.ER
if the platform data indicates that the controller will be used in OTG mode, do not call request_mem_region since this would conflict with the gadget controller, causing one of the two probes to fail bug 696526 Change-Id: I64f71af8adf7ffa27e98e4fdb42d90de4203efde Reviewed-on: http://git-master/r/2298 Reviewed-by: Venkata (Muni) Anda <vanda@nvidia.com> Tested-by: Venkata (Muni) Anda <vanda@nvidia.com> Tested-by: Trivikram Kasivajhula <tkasivajhula@nvidia.com> Reviewed-by: Abhishek Aggarwal <aaggarwal@nvidia.com> Tested-by: Abhishek Aggarwal <aaggarwal@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
-rw-r--r--drivers/usb/host/ehci-tegra.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 54360baf4be0..d580875b3ac9 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -521,12 +521,14 @@ static int tegra_ehci_probe(struct platform_device *pdev)
e = -ENXIO;
goto fail_phy;
}
- res = request_mem_region(res->start, resource_size(res),
- dev_name(&pdev->dev));
- if (!res) {
- dev_err(&pdev->dev, "resource in use\n");
- e = -EBUSY;
- goto fail_phy;
+ if (!pdata->otg_mode) {
+ res = request_mem_region(res->start, resource_size(res),
+ dev_name(&pdev->dev));
+ if (!res) {
+ dev_err(&pdev->dev, "resource in use\n");
+ e = -EBUSY;
+ goto fail_phy;
+ }
}
hcd->rsrc_start = res->start;
hcd->rsrc_len = resource_size(res);