summaryrefslogtreecommitdiff
path: root/drivers/usb/misc/usb-ljca.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-08-18 09:59:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-08-18 09:59:06 -0700
commit3d9061d22bef282dfd993f9481a1f0cb755bd7f6 (patch)
tree6dee79d1e850a56fcdfa0f00c7d7e343881f0d2a /drivers/usb/misc/usb-ljca.c
parent57b14823ea68592bd67e4992a2bf0dd67abb68d6 (diff)
parentaf8e119f52e9c13e556be9e03f27957554a84656 (diff)
downloadlinux-3d9061d22bef282dfd993f9481a1f0cb755bd7f6.tar.gz
linux-3d9061d22bef282dfd993f9481a1f0cb755bd7f6.tar.bz2
linux-3d9061d22bef282dfd993f9481a1f0cb755bd7f6.zip
Merge tag 'usb-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB / Thunderbolt driver fixes from Greg KH: "Here are some small USB and Thunderbolt driver fixes for 6.11-rc4 to resolve some reported issues. Included in here are: - thunderbolt driver fixes for reported problems - typec driver fixes - xhci fixes - new device id for ljca usb driver All of these have been in linux-next this week with no reported issues" * tag 'usb-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: xhci: Fix Panther point NULL pointer deref at full-speed re-enumeration usb: misc: ljca: Add Lunar Lake ljca GPIO HID to ljca_gpio_hids[] Revert "usb: typec: tcpm: clear pd_event queue in PORT_RESET" usb: typec: ucsi: Fix the return value of ucsi_run_command() usb: xhci: fix duplicate stall handling in handle_tx_event() usb: xhci: Check for xhci->interrupters being allocated in xhci_mem_clearup() thunderbolt: Mark XDomain as unplugged when router is removed thunderbolt: Fix memory leaks in {port|retimer}_sb_regs_write()
Diffstat (limited to 'drivers/usb/misc/usb-ljca.c')
-rw-r--r--drivers/usb/misc/usb-ljca.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/misc/usb-ljca.c b/drivers/usb/misc/usb-ljca.c
index 2d30fc1be306..1a8d5e80b9ae 100644
--- a/drivers/usb/misc/usb-ljca.c
+++ b/drivers/usb/misc/usb-ljca.c
@@ -169,6 +169,7 @@ static const struct acpi_device_id ljca_gpio_hids[] = {
{ "INTC1096" },
{ "INTC100B" },
{ "INTC10D1" },
+ { "INTC10B5" },
{},
};