Commit 9525dcb3 authored by Roel Kluin's avatar Roel Kluin Committed by Greg Kroah-Hartman

USB: fhci: mutually exclusive port_status

FHCI_PORT_DISABLED, -LOW and -FULL are mutually exclusive as status.
Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9d37ff64
...@@ -576,9 +576,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd) ...@@ -576,9 +576,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd)
out_be16(&usb->fhci->regs->usb_event, out_be16(&usb->fhci->regs->usb_event,
usb->saved_msk); usb->saved_msk);
} else if (usb->port_status == FHCI_PORT_DISABLED) { } else if (usb->port_status == FHCI_PORT_DISABLED) {
if (fhci_ioports_check_bus_state(fhci) == 1 && if (fhci_ioports_check_bus_state(fhci) == 1)
usb->port_status != FHCI_PORT_LOW &&
usb->port_status != FHCI_PORT_FULL)
fhci_device_connected_interrupt(fhci); fhci_device_connected_interrupt(fhci);
} }
usb_er &= ~USB_E_RESET_MASK; usb_er &= ~USB_E_RESET_MASK;
...@@ -605,9 +603,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd) ...@@ -605,9 +603,7 @@ irqreturn_t fhci_irq(struct usb_hcd *hcd)
} }
if (usb_er & USB_E_IDLE_MASK) { if (usb_er & USB_E_IDLE_MASK) {
if (usb->port_status == FHCI_PORT_DISABLED && if (usb->port_status == FHCI_PORT_DISABLED) {
usb->port_status != FHCI_PORT_LOW &&
usb->port_status != FHCI_PORT_FULL) {
usb_er &= ~USB_E_RESET_MASK; usb_er &= ~USB_E_RESET_MASK;
fhci_device_connected_interrupt(fhci); fhci_device_connected_interrupt(fhci);
} else if (usb->port_status == } else if (usb->port_status ==
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment