Merge 5.8-rc7 into tty-next
we need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -557,6 +557,10 @@ static bool need_bw_sch(struct usb_host_endpoint *ep,
|
||||
if (is_fs_or_ls(speed) && !has_tt)
|
||||
return false;
|
||||
|
||||
/* skip endpoint with zero maxpkt */
|
||||
if (usb_endpoint_maxp(&ep->desc) == 0)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@@ -265,6 +265,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
|
||||
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
|
||||
pdev->device == 0x1142)
|
||||
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
|
||||
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
|
||||
pdev->device == 0x2142)
|
||||
xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
|
||||
|
||||
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
|
||||
pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)
|
||||
|
@@ -856,7 +856,7 @@ static int tegra_xusb_init_context(struct tegra_xusb *tegra)
|
||||
if (!tegra->context.ipfs)
|
||||
return -ENOMEM;
|
||||
|
||||
tegra->context.fpci = devm_kcalloc(tegra->dev, soc->ipfs.num_offsets,
|
||||
tegra->context.fpci = devm_kcalloc(tegra->dev, soc->fpci.num_offsets,
|
||||
sizeof(u32), GFP_KERNEL);
|
||||
if (!tegra->context.fpci)
|
||||
return -ENOMEM;
|
||||
|
Reference in New Issue
Block a user