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>

diff --cc drivers/usb/typec/mux/intel_pmc_mux.c
index a6426a076d5a4a6454f9ac2d46b1b1ea9956233b,ec7da0fa3cf8c6c54b430d9edeb97a7c47e567af..307830b374ec78f4f59d3ca19fdf91257285a315
--- 1/drivers/usb/typec/mux/intel_pmc_mux.c
--- 2/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;
  }