summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/otg/tegra-otg.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/usb/otg/tegra-otg.c b/drivers/usb/otg/tegra-otg.c
index ecb88acf8d24..68d402afb25e 100644
--- a/drivers/usb/otg/tegra-otg.c
+++ b/drivers/usb/otg/tegra-otg.c
@@ -62,7 +62,6 @@ struct tegra_otg_data {
struct platform_device *pdev;
struct work_struct work;
unsigned int intr_reg_data;
- bool detect_vbus;
bool clk_enabled;
callback_t charger_cb;
void *charger_cb_data;
@@ -257,12 +256,6 @@ static void irq_work(struct work_struct *work)
unsigned long flags;
unsigned long status;
- if (tegra->detect_vbus) {
- tegra->detect_vbus = false;
- tegra_otg_enable_clk();
- return;
- }
-
clk_enable(tegra->clk);
spin_lock_irqsave(&tegra->lock, flags);
@@ -307,7 +300,6 @@ static irqreturn_t tegra_otg_irq(int irq, void *data)
otg_writel(tegra, val, USB_PHY_WAKEUP);
if ((val & USB_ID_INT_STATUS) || (val & USB_VBUS_INT_STATUS)) {
tegra->int_status = val;
- tegra->detect_vbus = false;
schedule_work(&tegra->work);
}
}
@@ -319,8 +311,7 @@ static irqreturn_t tegra_otg_irq(int irq, void *data)
void tegra_otg_check_vbus_detection(void)
{
- tegra_clone->detect_vbus = true;
- schedule_work(&tegra_clone->work);
+ tegra_otg_enable_clk();
}
EXPORT_SYMBOL(tegra_otg_check_vbus_detection);
@@ -345,7 +336,6 @@ static int tegra_otg_set_peripheral(struct otg_transceiver *otg,
if ((val & USB_ID_INT_STATUS) || (val & USB_VBUS_INT_STATUS)) {
tegra->int_status = val;
- tegra->detect_vbus = false;
schedule_work (&tegra->work);
}