Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce7ba95c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc fixes from Greg KH:
 "Here are two patches for 4.13-rc5.

  One is a fix for a reported thunderbolt issue, and the other a fix for
  an MEI driver issue. Both have been in linux-next with no reported
  issues"

* tag 'char-misc-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  thunderbolt: Do not enumerate more ports from DROM than the controller has
  mei: exclude device from suspend direct complete optimization
parents 438630ef 1cd65d17

drivers/misc/mei/pci-me.c

+6 −0
Original line number Diff line number Diff line
@@ -215,6 +215,12 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_set_drvdata(pdev, dev);



	/*

	 * MEI requires to resume from runtime suspend mode

	 * in order to perform link reset flow upon system suspend.

	 */

	pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;



	/*

	* For not wake-able HW runtime pm framework

	* can't be used on pci device level.

drivers/misc/mei/pci-txe.c

+6 −0
Original line number Diff line number Diff line
@@ -137,6 +137,12 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_set_drvdata(pdev, dev);



	/*

	 * MEI requires to resume from runtime suspend mode

	 * in order to perform link reset flow upon system suspend.

	 */

	pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;



	/*

	* For not wake-able HW runtime pm framework

	* can't be used on pci device level.

drivers/thunderbolt/eeprom.c

+9 −0
Original line number Diff line number Diff line
@@ -333,6 +333,15 @@ static int tb_drom_parse_entry_port(struct tb_switch *sw, 
	int res;

	enum tb_port_type type;



	/*

	 * Some DROMs list more ports than the controller actually has

	 * so we skip those but allow the parser to continue.

	 */

	if (header->index > sw->config.max_port_number) {

		dev_info_once(&sw->dev, "ignoring unnecessary extra entries in DROM\n");

		return 0;

	}



	port = &sw->ports[header->index];

	port->disabled = header->port_disabled;

	if (port->disabled)