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

Commit 757de492 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: fix platform quirks overwrite regression in 4.7-rc1 



commit b1c127ae ("usb: host: xhci: plat: make use of new methods in
xhci_plat_priv") sets xhci->quirks before calling xhci_gen_setup(), which
will overwrite them.

Don't overwite the quirks, just add the new ones

Fixes: b1c127ae ("usb: host: xhci: plat: make use of new methods in xhci_plat_priv")
Reported-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de95c40d

drivers/usb/host/xhci.c

+1 −1
Original line number Diff line number Diff line
@@ -4889,7 +4889,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) 
		xhci->hcc_params2 = readl(&xhci->cap_regs->hcc_params2);

	xhci_print_registers(xhci);



	xhci->quirks = quirks;

	xhci->quirks |= quirks;



	get_quirks(dev, xhci);