Commit 6b5199f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-7.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fix from Greg KH:
 "Here is a single USB fix for a reported regression in a recent USB
  typec patch for 7.0-final. Sorry for the late submission, but it does
  fix a problem that people have been seeing with 7.0-rc7 and the stable
  kernels (due to a backported fix from there.)

  This has been in linux-next this week with no reported issues, and the
  reporter (Takashi), has said it resolves the problem they were seeing"

* tag 'usb-7.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: typec: ucsi: skip connector validation before init
parents 778322a0 5a114040

drivers/usb/typec/ucsi/ucsi.c

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ void ucsi_notify_common(struct ucsi *ucsi, u32 cci) 
		return;



	if (UCSI_CCI_CONNECTOR(cci)) {

		if (UCSI_CCI_CONNECTOR(cci) <= ucsi->cap.num_connectors)

		if (!ucsi->cap.num_connectors ||

		    UCSI_CCI_CONNECTOR(cci) <= ucsi->cap.num_connectors)

			ucsi_connector_change(ucsi, UCSI_CCI_CONNECTOR(cci));

		else

			dev_err(ucsi->dev, "bogus connector number in CCI: %lu\n",