Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/usb/host/fhci-sched.c

+2 −6
Original line number Diff line number Diff line
@@ -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 ==