Merge branch 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integrat...

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.14.y

* 'connectivity-ti-linux-3.14.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  usb: host: xhci-pci: Fix NULL pointer dereference error
  ti_config_fragments/connectivity.cfg: disable CONFIG_USB_OTG_WHITELIST

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 11f16cbaa4fdbd77b1b81ab115025da078cf55af..67b952971c1b6d469036c268d0c19581beaec258 100644 (file)
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -230,7 +230,6 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        /* USB 2.0 roothub is stored in the PCI device now. */
        hcd = dev_get_drvdata(&dev->dev);
        xhci = hcd_to_xhci(hcd);
-       xhci->main_hcd = hcd;
        xhci->shared_hcd = usb_create_shared_hcd(driver, &dev->dev,
                                pci_name(dev), hcd);
        if (!xhci->shared_hcd) {

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 397c0dddafcc1641a1f5ff3a817361ad900b238c..b14f57202bb70eb2cd3480a602cda85d60829159 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -4842,6 +4842,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
                 */
                hcd->speed = HCD_USB2;
                hcd->self.root_hub->speed = USB_SPEED_HIGH;
+               xhci->main_hcd = hcd;
                /*
                 * USB 2.0 roothub under xHCI has an integrated TT,
                 * (rate matching hub) as opposed to having an OHCI/UHCI

diff --git a/ti_config_fragments/connectivity.cfg b/ti_config_fragments/connectivity.cfg
index 883e192d5c027823caa63ed43d6ad1401f998178..00b99126cce433b3502094d0e2b7681c564b3abb 100644 (file)
--- a/ti_config_fragments/connectivity.cfg
+++ b/ti_config_fragments/connectivity.cfg
@@ -29,6 +29,7 @@ CONFIG_USB_TEST=m
 
 #USB OTG
 CONFIG_USB_OTG=y
+CONFIG_USB_OTG_WHITELIST=n
 
 #USB MUSB support
 CONFIG_USB_MUSB_HDRC=m