thunderbolt: Fix a logic error in wake on connect

commit a5cfc9d65879c ("thunderbolt: Add wake on connect/disconnect
on USB4 ports") introduced a sysfs file to control wake up policy
for a given USB4 port that defaulted to disabled.

However when testing commit 4bfeea6ec1c02 ("thunderbolt: Use wake
on connect and disconnect over suspend") I found that it was working
even without making changes to the power/wakeup file (which defaults
to disabled). This is because of a logic error doing a bitwise or
of the wake-on-connect flag with device_may_wakeup() which should
have been a logical AND.

Adjust the logic so that policy is only applied when wakeup is
actually enabled.

Fixes: a5cfc9d65879c ("thunderbolt: Add wake on connect/disconnect on USB4 ports")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/usb4.c b/drivers/thunderbolt/usb4.c
index e51d01671d8e7cb79494df458b7ecade04d3fce6..3e96f1afd4268e3c2a4f92f78784e8efd17a0eec 100644 (file)
--- a/drivers/thunderbolt/usb4.c
+++ b/drivers/thunderbolt/usb4.c
@@ -440,10 +440,10 @@ int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags)
                        bool configured = val & PORT_CS_19_PC;
                        usb4 = port->usb4;
 
-                       if (((flags & TB_WAKE_ON_CONNECT) |
+                       if (((flags & TB_WAKE_ON_CONNECT) &&
                              device_may_wakeup(&usb4->dev)) && !configured)
                                val |= PORT_CS_19_WOC;
-                       if (((flags & TB_WAKE_ON_DISCONNECT) |
+                       if (((flags & TB_WAKE_ON_DISCONNECT) &&
                              device_may_wakeup(&usb4->dev)) && configured)
                                val |= PORT_CS_19_WOD;
                        if ((flags & TB_WAKE_ON_USB4) && configured)