Commit 769cafe4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v7.0-rc5' of... 

Merge tag 'thunderbolt-for-v7.0-rc5' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Mika writes:

thunderbolt: Fix for v7.0-rc5

This includes a single fix that reverses the check for return value of
device_property_read_u8() during the driver load.

This has been in linux-next with no reported issues.

* tag 'thunderbolt-for-v7.0-rc5' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix property read in nhi_wake_supported()
parents f338e773 73a505dc

drivers/thunderbolt/nhi.c

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static bool nhi_wake_supported(struct pci_dev *pdev) 
	 * If power rails are sustainable for wakeup from S4 this

	 * property is set by the BIOS.

	 */

	if (device_property_read_u8(&pdev->dev, "WAKE_SUPPORTED", &val))

	if (!device_property_read_u8(&pdev->dev, "WAKE_SUPPORTED", &val))

		return !!val;



	return true;