Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+21
+6
drivers/misc/mei/pci-me.c
+6
drivers/misc/mei/pci-me.c
···
216
216
pci_set_drvdata(pdev, dev);
217
217
218
218
/*
219
+
* MEI requires to resume from runtime suspend mode
220
+
* in order to perform link reset flow upon system suspend.
221
+
*/
222
+
pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;
223
+
224
+
/*
219
225
* For not wake-able HW runtime pm framework
220
226
* can't be used on pci device level.
221
227
* Use domain runtime pm callbacks instead.
+6
drivers/misc/mei/pci-txe.c
+6
drivers/misc/mei/pci-txe.c
···
138
138
pci_set_drvdata(pdev, dev);
139
139
140
140
/*
141
+
* MEI requires to resume from runtime suspend mode
142
+
* in order to perform link reset flow upon system suspend.
143
+
*/
144
+
pdev->dev_flags |= PCI_DEV_FLAGS_NEEDS_RESUME;
145
+
146
+
/*
141
147
* For not wake-able HW runtime pm framework
142
148
* can't be used on pci device level.
143
149
* Use domain runtime pm callbacks instead.
+9
drivers/thunderbolt/eeprom.c
+9
drivers/thunderbolt/eeprom.c
···
333
333
int res;
334
334
enum tb_port_type type;
335
335
336
+
/*
337
+
* Some DROMs list more ports than the controller actually has
338
+
* so we skip those but allow the parser to continue.
339
+
*/
340
+
if (header->index > sw->config.max_port_number) {
341
+
dev_info_once(&sw->dev, "ignoring unnecessary extra entries in DROM\n");
342
+
return 0;
343
+
}
344
+
336
345
port = &sw->ports[header->index];
337
346
port->disabled = header->port_disabled;
338
347
if (port->disabled)