xhci: Fix memory leak in xhci_pme_acpi_rtd3_enable()
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 xhci: Fix memory leak in xhci_pme_acpi_rtd3_enable()
From: Mika Westerberg <[email protected]>
There is a memory leak because acpi_evaluate_dsm() actually returns an object which the caller is supposed to release. Fix this by calling ACPI_FREE() for the returned object (this expands to kfree() so passing NULL there is fine as well).
While there correct indentation in !CONFIG_ACPI case.
--- drivers/usb/host/xhci-pci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-pci.c +6 -2
@@ -188,10 +188,14 @@ static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev)0xb7 ,0x0c ,0x34 ,0xac ,0x01 ,0xe9 ,0xbf ,0x45 , 0xb7, 0xe6, 0x2b, 0x34, 0xec, 0x93, 0x1e, 0x23, }; -acpi_evaluate_dsm (ACPI_HANDLE (&dev->dev), intel_dsm_uuid,3 ,1 ,NULL ); +union acpi_object *obj; + + obj =acpi_evaluate_dsm (ACPI_HANDLE (&dev->dev), intel_dsm_uuid,3 ,1 , +NULL ); +ACPI_FREE (obj); }#else -static void xhci_pme_acpi_rtd3_enable (struct pci_dev *dev) { } +static void xhci_pme_acpi_rtd3_enable (struct pci_dev *dev) { }#endif /* CONFIG_ACPI */ /* called during probe() after chip reset completes */
Signature · 1 line
1.9.1
PATCH 2/2 usb: xhci: fix config fail of FS hub behind a HS hub with MTT
In reply to a message not in the archiveFrom: Chunfeng Yun <[email protected]>
if a full speed hub connects to a high speed hub which supports MTT, the MTT field of its slot context will be set to 1 when xHCI driver setups an xHCI virtual device in xhci_setup_addressable_virt_dev(); once usb core fetch its hub descriptor, and need to update the xHC's internal data structures for the device, the HUB field of its slot context will be set to 1 too, meanwhile MTT is also set before, this will cause configure endpoint command fail, so in the case, we should clear MTT to 0 for full speed hub according to section 6.2.2
--- drivers/usb/host/xhci.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/usb/host/xhci.c +8 -0
@@ -4778,8 +4778,16 @@ int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, ctrl_ctx->add_flags |=cpu_to_le32 (SLOT_FLAG ); slot_ctx =xhci_get_slot_ctx (xhci, config_cmd->in_ctx); slot_ctx->dev_info |=cpu_to_le32 (DEV_HUB ); +/* +* refer to section 6.2.2: MTT should be 0 for full speed hub, +* but it may be already set to 1 when setup an xHCI virtual +* device, so clear it anyway. +*/ if (tt->multi) slot_ctx->dev_info |=cpu_to_le32 (DEV_MTT ); +else if (hdev->speed ==USB_SPEED_FULL ) + slot_ctx->dev_info &=cpu_to_le32 (~DEV_MTT ); +if (xhci->hci_version >0x95 ) { xhci_dbg(xhci, "xHCI version %x needs hub " "TT think time and number of ports\n",
Signature · 1 line
1.9.1