From 223aaf1456aace22bf2b811fdfda6332b39cc924 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Wed, 10 Jun 2009 12:57:35 -0700 Subject: [PATCH] --- yaml --- r: 155361 b: refs/heads/master c: 9525dcb30f5f412748f58a0537002ea47cfe55de h: refs/heads/master i: 155359: 7e83d52697ca83af01176f75dc09edceb620db23 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/fhci-sched.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index db1187550f09..c2b9d6f878e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d37ff64567f852a222c78e7d13037bb02395dc7 +refs/heads/master: 9525dcb30f5f412748f58a0537002ea47cfe55de diff --git a/trunk/drivers/usb/host/fhci-sched.c b/trunk/drivers/usb/host/fhci-sched.c index bb63b68ddb77..62a226b61670 100644 --- a/trunk/drivers/usb/host/fhci-sched.c +++ b/trunk/drivers/usb/host/fhci-sched.c @@ -576,9 +576,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd) out_be16(&usb->fhci->regs->usb_event, usb->saved_msk); } else if (usb->port_status == FHCI_PORT_DISABLED) { - if (fhci_ioports_check_bus_state(fhci) == 1 && - usb->port_status != FHCI_PORT_LOW && - usb->port_status != FHCI_PORT_FULL) + if (fhci_ioports_check_bus_state(fhci) == 1) fhci_device_connected_interrupt(fhci); } usb_er &= ~USB_E_RESET_MASK; @@ -605,9 +603,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd) } if (usb_er & USB_E_IDLE_MASK) { - if (usb->port_status == FHCI_PORT_DISABLED && - usb->port_status != FHCI_PORT_LOW && - usb->port_status != FHCI_PORT_FULL) { + if (usb->port_status == FHCI_PORT_DISABLED) { usb_er &= ~USB_E_RESET_MASK; fhci_device_connected_interrupt(fhci); } else if (usb->port_status ==