From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 14 Sep 2020 08:10:55 +0000 (+0200)
Subject: Merge 5.9-rc5 into usb-next
X-Git-Tag: v5.10.7~1419^2~104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fccee0baced04636952cd580ddee4bb8cbb9544c;p=platform%2Fkernel%2Flinux-rpi.git

Merge 5.9-rc5 into usb-next

We need the USB fixes in here as well.

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

fccee0baced04636952cd580ddee4bb8cbb9544c
diff --cc drivers/usb/typec/mux/intel_pmc_mux.c
index a6426a0,ec7da0f..307830b
--- a/drivers/usb/typec/mux/intel_pmc_mux.c
+++ b/drivers/usb/typec/mux/intel_pmc_mux.c
@@@ -625,10 -485,9 +613,11 @@@ err_remove_ports
  	for (i = 0; i < pmc->num_ports; i++) {
  		typec_switch_unregister(pmc->port[i].typec_sw);
  		typec_mux_unregister(pmc->port[i].typec_mux);
+ 		usb_role_switch_unregister(pmc->port[i].usb_sw);
  	}
  
 +	put_device(&pmc->iom_adev->dev);
 +
  	return ret;
  }
  
@@@ -640,10 -499,9 +629,11 @@@ static int pmc_usb_remove(struct platfo
  	for (i = 0; i < pmc->num_ports; i++) {
  		typec_switch_unregister(pmc->port[i].typec_sw);
  		typec_mux_unregister(pmc->port[i].typec_mux);
+ 		usb_role_switch_unregister(pmc->port[i].usb_sw);
  	}
  
 +	put_device(&pmc->iom_adev->dev);
 +
  	return 0;
  }