mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
USB: fhci: mutually exclusive port_status
FHCI_PORT_DISABLED, -LOW and -FULL are mutually exclusive as status. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
9d37ff6456
commit
9525dcb30f
1 changed files with 2 additions and 6 deletions
|
@ -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 ==
|
||||
|
|
Loading…
Reference in a new issue