From 283d40312f4aff2d42efd4ef210797303cf63cba Mon Sep 17 00:00:00 2001 From: Bob Liu Date: Sat, 23 Oct 2010 05:12:00 -0500 Subject: [PATCH] --- yaml --- r: 221925 b: refs/heads/master c: 68f64714dc35a515a3064b300729e7809bcdd0e0 h: refs/heads/master i: 221923: a9001f5df408d6acbbe8e21aa47abcf90b469be8 v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/blackfin.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 18b6e0ed1564..ec33b335ee19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e393c6eece048052d4131ec4dad3b98e35a98e2 +refs/heads/master: 68f64714dc35a515a3064b300729e7809bcdd0e0 diff --git a/trunk/drivers/usb/musb/blackfin.c b/trunk/drivers/usb/musb/blackfin.c index 32cc6d927760..ade45a219c47 100644 --- a/trunk/drivers/usb/musb/blackfin.c +++ b/trunk/drivers/usb/musb/blackfin.c @@ -171,8 +171,9 @@ static irqreturn_t blackfin_interrupt(int irq, void *__hci) } /* Start sampling ID pin, when plug is removed from MUSB */ - if (is_otg_enabled(musb) && (musb->xceiv->state == OTG_STATE_B_IDLE - || musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) { + if ((is_otg_enabled(musb) && (musb->xceiv->state == OTG_STATE_B_IDLE + || musb->xceiv->state == OTG_STATE_A_WAIT_BCON)) || + (musb->int_usb & MUSB_INTR_DISCONNECT && is_host_active(musb))) { mod_timer(&musb_conn_timer, jiffies + TIMER_DELAY); musb->a_wait_bcon = TIMER_DELAY; }