On Thu, 2016-02-11 at 14:58 +0100, Jiri Slaby wrote: > From: Oliver Neukum <[email protected]> > > 3.12-stable review patch. If anyone has any objections, please let me know. > > =============== > > commit 1eaf35e4dd592c59041bc1ed3248c46326da1f5f upstream. > > The module should fail to load. > > Signed-off-by: Oliver Neukum <[email protected]> > Signed-off-by: Jiri Slaby <[email protected]> > --- > drivers/usb/host/xhci.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c > index 47b25542a99c..6888e9a956d4 100644 > --- a/drivers/usb/host/xhci.c > +++ b/drivers/usb/host/xhci.c > @@ -4891,6 +4891,10 @@ static int __init xhci_hcd_init(void) > BUILD_BUG_ON(sizeof(struct xhci_intr_reg) != 8*32/8); > /* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */ > BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8); > + > + if (usb_disabled()) > + return -ENODEV; > + > return 0; > unreg_pci: > xhci_unregister_pci();
This check needs to go at the top of the function, before the call to
xhci_register_pci().
Ben.
--
Ben Hutchings
Life is what happens to you while you're busy making other plans.
- John Lennon
signature.asc
Description: This is a digitally signed message part
