diff options
| author | Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> | 2013-10-15 22:23:28 +0530 |
|---|---|---|
| committer | Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> | 2013-10-15 22:23:28 +0530 |
| commit | 22c4d4b3ae3e971bba336e4e5d5ba3bd03dc4ade (patch) | |
| tree | c15c27cb77ad9320d506d296e06788e4380dbc9d | |
| parent | e2e8ac901e617573ea383f9cffd136146d0675a4 (diff) | |
| download | SLOF-22c4d4b3ae3e971bba336e4e5d5ba3bd03dc4ade.zip SLOF-22c4d4b3ae3e971bba336e4e5d5ba3bd03dc4ade.tar.gz SLOF-22c4d4b3ae3e971bba336e4e5d5ba3bd03dc4ade.tar.bz2 | |
usb-core: disable xhci
Code still does not support xhci, disable creation of xhci node, as it
was causing crash in the quiesce path.
Also check if ops pointer is verified before accessing function
pointers during usb_hcd_exit.
Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
| -rw-r--r-- | lib/libusb/usb-core.c | 2 | ||||
| -rw-r--r-- | slof/fs/devices/pci-class_0c.fs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libusb/usb-core.c b/lib/libusb/usb-core.c index 6c40913..b169e74 100644 --- a/lib/libusb/usb-core.c +++ b/lib/libusb/usb-core.c @@ -182,7 +182,7 @@ void usb_hcd_exit(void *_hcidev) struct usb_hcd_dev *hcidev = _hcidev; dprintf("%s: enter \n", __func__); - if (!hcidev) { + if (!hcidev || !hcidev->ops) { printf("Device Error"); return; } diff --git a/slof/fs/devices/pci-class_0c.fs b/slof/fs/devices/pci-class_0c.fs index 9c47325..9ee2bde 100644 --- a/slof/fs/devices/pci-class_0c.fs +++ b/slof/fs/devices/pci-class_0c.fs @@ -55,10 +55,10 @@ CONSTANT /hci-dev handle-usb-class set-ehci-alias ENDOF - 0330 OF \ XHCI controller - handle-usb-class - set-xhci-alias - ENDOF +\ 0330 OF \ XHCI controller +\ handle-usb-class +\ set-xhci-alias +\ ENDOF ENDCASE ; |