Commit 81219f80 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v5.11-rc7' of... 

Merge tag 'thunderbolt-for-v5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Mika writes:

thunderbolt: Fix for v5.11-rc7

A single fix for a possible NULL pointer dereference when adding device
links from ACPI description.

* tag 'thunderbolt-for-v5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix possible NULL pointer dereference in tb_acpi_add_link()
parents 3e1f4a2e 4d395c5e

drivers/thunderbolt/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static acpi_status tb_acpi_add_link(acpi_handle handle, u32 level, void *data, 
	 * managed with the xHCI and the SuperSpeed hub so we create the

	 * link from xHCI instead.

	 */

	while (!dev_is_pci(dev))

	while (dev && !dev_is_pci(dev))

		dev = dev->parent;



	if (!dev)