mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
char/misc fixes for 4.13-rc5
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. Signed-off-by: Greg Kroah-Hartman <[email protected]> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCWY+zfg8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ynOKQCfYPp20/4S/DRl/O9mtFG6+Iczmm8AnAnFUVrN EHmUF2ipsm4FQ4iZSot3 =yLZO -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
ce7ba95cf0
3 changed files with 21 additions and 0 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue