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

Commit e8b24450 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Greg Kroah-Hartman
Browse files

USB: Hook start_hnp into ohci struct 



Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1133cd8a

drivers/usb/host/ohci-hub.c

+1 −3
Original line number Diff line number Diff line
@@ -579,8 +579,6 @@ static int ohci_start_port_reset (struct usb_hcd *hcd, unsigned port) 
	return 0;

}



static void start_hnp(struct ohci_hcd *ohci);



#else



#define	ohci_start_port_reset		NULL
@@ -767,7 +765,7 @@ static int ohci_hub_control ( 
#ifdef	CONFIG_USB_OTG

			if (hcd->self.otg_port == (wIndex + 1)

					&& hcd->self.b_hnp_enable)

				start_hnp(ohci);

				ohci->start_hnp(ohci);

			else

#endif

			ohci_writel (ohci, RH_PS_PSS,

drivers/usb/host/ohci-omap.c

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) 
			dev_err(hcd->self.controller, "can't find transceiver\n");

			return -ENODEV;

		}

		ohci->start_hnp = start_hnp;

	}

#endif

drivers/usb/host/ohci.h

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ struct ohci_hcd { 
	 * other external transceivers should be software-transparent

	 */

	struct otg_transceiver	*transceiver;

	void (*start_hnp)(struct ohci_hcd *ohci);



	/*

	 * memory management for queue data structures