xhci: fix platform quirks overwrite regression in 4.7-rc1
authorMathias Nyman <mathias.nyman@linux.intel.com>
Wed, 1 Jun 2016 15:09:10 +0000 (18:09 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Jun 2016 21:55:01 +0000 (14:55 -0700)
commit757de492f2d5711d4f5b386eb9bdd5cdc99eb30e
tree65bc56546421d25e2c467cca52d8d2bdf623d9ec
parentde95c40d5beaa47f6dc8fe9ac4159b4672b51523
xhci: fix platform quirks overwrite regression in 4.7-rc1

commit b1c127ae990b ("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: b1c127ae990b ("usb: host: xhci: plat: make use of new methods in xhci_plat_priv")
Reported-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci.c