From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 Nov 2020 08:16:56 +0000 (+0100)
Subject: Merge 5.10-rc4 into here.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0fb2c41f992cc58aa87fe42b6ee9c6048359670f;p=linux.git

Merge 5.10-rc4 into here.

We need the USB/Thunderbolt fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

0fb2c41f992cc58aa87fe42b6ee9c6048359670f
diff --cc drivers/usb/typec/ucsi/ucsi.c
index fad8680be7ab2,51a570d40a42e..f02958927cbd8
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@@ -766,8 -676,21 +768,10 @@@ static void ucsi_handle_connector_chang
  			ucsi_register_partner(con);
  		else
  			ucsi_unregister_partner(con);
+ 
+ 		ucsi_port_psy_changed(con);
  	}
  
 -	if (con->status.change & UCSI_CONSTAT_CAM_CHANGE) {
 -		/*
 -		 * We don't need to know the currently supported alt modes here.
 -		 * Running GET_CAM_SUPPORTED command just to make sure the PPM
 -		 * does not get stuck in case it assumes we do so.
 -		 */
 -		command = UCSI_GET_CAM_SUPPORTED;
 -		command |= UCSI_CONNECTOR_NUMBER(con->num);
 -		ucsi_send_command(con->ucsi, command, NULL, 0);
 -	}
 -
  	if (con->status.change & UCSI_CONSTAT_PARTNER_CHANGE)
  		ucsi_partner_change(con);