Skip to content

Commit 17f50e2

Browse files
committed
Merge tag 'usb-5.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb into master
Pull USB fixes from Greg KH: "Three small USB XHCI driver fixes for 5.8-rc7. They all resolve some minor issues that have been reported on some different platforms. All of these have been in linux-next with no reported issues" * tag 'usb-5.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: tegra: Fix allocation for the FPCI context usb: xhci: Fix ASM2142/ASM3142 DMA addressing usb: xhci-mtk: fix the failure of bandwidth allocation
2 parents cf48f79 + 0b98703 commit 17f50e2

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

drivers/usb/host/xhci-mtk-sch.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,10 @@ static bool need_bw_sch(struct usb_host_endpoint *ep,
557557
if (is_fs_or_ls(speed) && !has_tt)
558558
return false;
559559

560+
/* skip endpoint with zero maxpkt */
561+
if (usb_endpoint_maxp(&ep->desc) == 0)
562+
return false;
563+
560564
return true;
561565
}
562566

drivers/usb/host/xhci-pci.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
265265
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
266266
pdev->device == 0x1142)
267267
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
268+
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
269+
pdev->device == 0x2142)
270+
xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
268271

269272
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
270273
pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI)

drivers/usb/host/xhci-tegra.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ static int tegra_xusb_init_context(struct tegra_xusb *tegra)
856856
if (!tegra->context.ipfs)
857857
return -ENOMEM;
858858

859-
tegra->context.fpci = devm_kcalloc(tegra->dev, soc->ipfs.num_offsets,
859+
tegra->context.fpci = devm_kcalloc(tegra->dev, soc->fpci.num_offsets,
860860
sizeof(u32), GFP_KERNEL);
861861
if (!tegra->context.fpci)
862862
return -ENOMEM;

0 commit comments

Comments
 (0)