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

Commit aff6d18f authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: fix compile problems in ehci-hcd 



This patch (as1072) fixes some recently-introduced compile problems
that show up in ehci-hcd when CONFIG_PM is turned off.

	PORT_WAKE_BITS needs to be defined always.

	ehci_port_power() is called during initialization by all the
	EHCI variants other than the PCI version, in which it is
	"defined but not used".  So add a call to it.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4f667627

drivers/usb/host/ehci-hub.c

+2 −2
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 


/*-------------------------------------------------------------------------*/



#ifdef	CONFIG_PM



#define	PORT_WAKE_BITS	(PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E)



#ifdef	CONFIG_PM



static int ehci_hub_control(

	struct usb_hcd	*hcd,

	u16		typeReq,

drivers/usb/host/ehci-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
		ehci_warn(ehci, "selective suspend/wakeup unavailable\n");

#endif



	ehci_port_power(ehci, 1);

	retval = ehci_pci_reinit(ehci, pdev);

done:

	return retval;