summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-cardhu.c
diff options
context:
space:
mode:
authorRakesh Bodla <rbodla@nvidia.com>2011-03-25 21:24:25 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:45:42 -0800
commit5c6801423b8b5dfbf635c7180534894d7d042d69 (patch)
tree943e6fb342dbe95708b2b0f0467318885a3a7bb9 /arch/arm/mach-tegra/board-cardhu.c
parent12bf37c98bbc3ffb3970d24e8cc3563b8f34a4c6 (diff)
ARM: tegra: cardhu: Fix for NULL pointer dereference
USB2 is configured for UTMI instead of ULPI. Due to this there is a null point dereference in accessing vbus status in regulator code. Temporarily disabling USB2 for this. Bug 807534 Original-Change-Id: Ib0d3384258b4d62ee11e116dbe03a28d797a6adc Reviewed-on: http://git-master/r/24285 Reviewed-by: Rakesh Bodla <rbodla@nvidia.com> Tested-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com> Original-Change-Id: I479dffcc293aab4a6d7299f14a68f1f1708b1af4 Rebase-Id: Re97a000f318986be3bdc842a5a07a0e7a179af6b
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
-rw-r--r--arch/arm/mach-tegra/board-cardhu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c
index a7d50ace523a..c7a63e9db409 100644
--- a/arch/arm/mach-tegra/board-cardhu.c
+++ b/arch/arm/mach-tegra/board-cardhu.c
@@ -340,11 +340,13 @@ static void cardhu_usb_init(void)
tegra_otg_device.dev.platform_data = &tegra_otg_pdata;
platform_device_register(&tegra_otg_device);
- tegra_ehci2_device.dev.platform_data = &tegra_ehci_pdata[1];
+/* tegra_ehci2_device.dev.platform_data = &tegra_ehci_pdata[1];
platform_device_register(&tegra_ehci2_device);
+*/
tegra_ehci3_device.dev.platform_data = &tegra_ehci_pdata[2];
platform_device_register(&tegra_ehci3_device);
+
}
static void cardhu_gps_init(void)