diff options
Diffstat (limited to 'queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch')
| -rw-r--r-- | queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch b/queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch index 4c610f5524..51a864ae59 100644 --- a/queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch +++ b/queue-6.6/thunderbolt-avoid-notify-pm-core-about-runtime-pm-resume.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c -@@ -3106,7 +3106,26 @@ static int tb_switch_set_wake(struct tb_ +@@ -3208,7 +3208,26 @@ static int tb_switch_set_wake(struct tb_ return tb_lc_set_wake(sw, flags); } @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { struct tb_port *port; int err; -@@ -3155,6 +3174,9 @@ int tb_switch_resume(struct tb_switch *s +@@ -3257,6 +3276,9 @@ int tb_switch_resume(struct tb_switch *s if (err) return err; @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /* Disable wakes */ tb_switch_set_wake(sw, 0); -@@ -3184,7 +3206,8 @@ int tb_switch_resume(struct tb_switch *s +@@ -3286,7 +3308,8 @@ int tb_switch_resume(struct tb_switch *s */ if (tb_port_unlock(port)) tb_port_warn(port, "failed to unlock port\n"); @@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> tb_sw_set_unplugged(port->remote->sw); --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c -@@ -2250,7 +2250,7 @@ static int tb_resume_noirq(struct tb *tb +@@ -2262,7 +2262,7 @@ static int tb_resume_noirq(struct tb *tb /* remove any pci devices the firmware might have setup */ tb_switch_reset(tb->root_switch); @@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> tb_free_invalid_tunnels(tb); tb_free_unplugged_children(tb->root_switch); tb_restore_children(tb->root_switch); -@@ -2376,7 +2376,7 @@ static int tb_runtime_resume(struct tb * +@@ -2388,7 +2388,7 @@ static int tb_runtime_resume(struct tb * struct tb_tunnel *tunnel, *n; mutex_lock(&tb->lock); @@ -108,7 +108,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> int tb_switch_reset(struct tb_switch *sw); int tb_switch_wait_for_bit(struct tb_switch *sw, u32 offset, u32 bit, u32 value, int timeout_msec); -@@ -1222,6 +1222,7 @@ static inline bool tb_switch_is_usb4(con +@@ -1224,6 +1224,7 @@ static inline bool tb_switch_is_usb4(con return usb4_switch_version(sw) > 0; } |