diff options
| author | Rakesh Bodla <rbodla@nvidia.com> | 2011-03-30 15:27:42 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:43:30 -0800 |
| commit | 9e47b2fb15805a9ec98b97bf57d7044dfbde77e3 (patch) | |
| tree | c3b15dc2e3f744e4fa7300cd43d76b26b6b1d8e0 /drivers/usb/otg | |
| parent | c076f3559f17e7ffdf825e8993c2892f90923e1a (diff) | |
ARM: tegra: usb: Fixing usb break after kernel merge
After kernel merge usb is broken. This is due to
improper merge of usb files. Fixed all the merge
issues.
Bug 807534
Original-Change-Id: Id9f6ae0022a84bcc7b4e39965a469ae8947faa83
Reviewed-on: http://git-master/r/24806
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: Ib5f76a2660f8d761eac08721c7d147b8cc11c2bf
Rebase-Id: Ra6167912c4fed42f8b7e4efe6237a574ec3f4af4
Diffstat (limited to 'drivers/usb/otg')
| -rw-r--r-- | drivers/usb/otg/tegra-otg.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/otg/tegra-otg.c b/drivers/usb/otg/tegra-otg.c index a4c2b621f9ed..386bb8b922da 100644 --- a/drivers/usb/otg/tegra-otg.c +++ b/drivers/usb/otg/tegra-otg.c @@ -341,7 +341,6 @@ static int tegra_otg_probe(struct platform_device *pdev) } INIT_WORK (&tegra->work, irq_work); - clk_disable(tegra->clk); dev_info(&pdev->dev, "otg transceiver registered\n"); clk_disable(tegra->clk); return 0; |