Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,6/9] usb: roles: Find the muxes by also matching against the device node From: Heikki Krogerus Message-Id: <20190130160259.46919-7-heikki.krogerus@linux.intel.com> Date: Wed, 30 Jan 2019 19:02:56 +0300 To: Greg Kroah-Hartman Cc: Andy Shevchenko , Chen Yu , Jun Li , Hans de Goede , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: V2hlbiB0aGUgY29ubmVjdGlvbnMgYXJlIGRlZmluZWQgaW4gZmlybXdhcmUsIHN0cnVjdApkZXZp Y2VfY29ubmVjdGlvbiB3aWxsIGhhdmUgdGhlIGZ3bm9kZSBtZW1iZXIgcG9pbnRpbmcgdG8KdGhl IGRldmljZSBub2RlIChzdHJ1Y3QgZndub2RlX2hhbmRsZSkgb2YgdGhlIHJlcXVlc3RlZApkZXZp Y2UsIGFuZCB0aGUgZW5kcG9pbnQgd2lsbCBub3QgYmUgdXNlZCBhdCBhbGwgaW4gdGhhdApjYXNl LgoKU2lnbmVkLW9mZi1ieTogSGVpa2tpIEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvdXNiL3JvbGVzL2NsYXNzLmMgfCAyMSArKysrKysrKysr KysrKysrKystLS0KIGluY2x1ZGUvbGludXgvdXNiL3JvbGUuaCAgfCAgMSArCiAyIGZpbGVzIGNo YW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy91c2Ivcm9sZXMvY2xhc3MuYyBiL2RyaXZlcnMvdXNiL3JvbGVzL2NsYXNzLmMKaW5kZXgg OTkxMTZhZjA3ZjFkLi5mNDVkOGRmNWNmYjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL3JvbGVz L2NsYXNzLmMKKysrIGIvZHJpdmVycy91c2Ivcm9sZXMvY2xhc3MuYwpAQCAtOCw2ICs4LDcgQEAK ICAqLwogCiAjaW5jbHVkZSA8bGludXgvdXNiL3JvbGUuaD4KKyNpbmNsdWRlIDxsaW51eC9wcm9w ZXJ0eS5oPgogI2luY2x1ZGUgPGxpbnV4L2RldmljZS5oPgogI2luY2x1ZGUgPGxpbnV4L21vZHVs ZS5oPgogI2luY2x1ZGUgPGxpbnV4L211dGV4Lmg+CkBAIC04NCw3ICs4NSwxMiBAQCBlbnVtIHVz Yl9yb2xlIHVzYl9yb2xlX3N3aXRjaF9nZXRfcm9sZShzdHJ1Y3QgdXNiX3JvbGVfc3dpdGNoICpz dykKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKHVzYl9yb2xlX3N3aXRjaF9nZXRfcm9sZSk7CiAKLXN0 YXRpYyBpbnQgX19zd2l0Y2hfbWF0Y2goc3RydWN0IGRldmljZSAqZGV2LCBjb25zdCB2b2lkICpu YW1lKQorc3RhdGljIGludCBzd2l0Y2hfZndub2RlX21hdGNoKHN0cnVjdCBkZXZpY2UgKmRldiwg Y29uc3Qgdm9pZCAqZndub2RlKQoreworCXJldHVybiBkZXZfZndub2RlKGRldikgPT0gZndub2Rl OworfQorCitzdGF0aWMgaW50IHN3aXRjaF9uYW1lX21hdGNoKHN0cnVjdCBkZXZpY2UgKmRldiwg Y29uc3Qgdm9pZCAqbmFtZSkKIHsKIAlyZXR1cm4gIXN0cmNtcCgoY29uc3QgY2hhciAqKW5hbWUs IGRldl9uYW1lKGRldikpOwogfQpAQCAtOTQsOCArMTAwLDE2IEBAIHN0YXRpYyB2b2lkICp1c2Jf cm9sZV9zd2l0Y2hfbWF0Y2goc3RydWN0IGRldmljZV9jb25uZWN0aW9uICpjb24sIGludCBlcCwK IHsKIAlzdHJ1Y3QgZGV2aWNlICpkZXY7CiAKLQlkZXYgPSBjbGFzc19maW5kX2RldmljZShyb2xl X2NsYXNzLCBOVUxMLCBjb24tPmVuZHBvaW50W2VwXSwKLQkJCQlfX3N3aXRjaF9tYXRjaCk7CisJ aWYgKGNvbi0+Zndub2RlKSB7CisJCWlmICghZndub2RlX3Byb3BlcnR5X3ByZXNlbnQoY29uLT5m d25vZGUsIGNvbi0+aWQpKQorCQkJcmV0dXJuIE5VTEw7CisKKwkJZGV2ID0gY2xhc3NfZmluZF9k ZXZpY2Uocm9sZV9jbGFzcywgTlVMTCwgY29uLT5md25vZGUsCisJCQkJCXN3aXRjaF9md25vZGVf bWF0Y2gpOworCX0gZWxzZSB7CisJCWRldiA9IGNsYXNzX2ZpbmRfZGV2aWNlKHJvbGVfY2xhc3Ms IE5VTEwsIGNvbi0+ZW5kcG9pbnRbZXBdLAorCQkJCQlzd2l0Y2hfbmFtZV9tYXRjaCk7CisJfQog CiAJcmV0dXJuIGRldiA/IHRvX3JvbGVfc3dpdGNoKGRldikgOiBFUlJfUFRSKC1FUFJPQkVfREVG RVIpOwogfQpAQCAtMjY2LDYgKzI4MCw3IEBAIHVzYl9yb2xlX3N3aXRjaF9yZWdpc3RlcihzdHJ1 Y3QgZGV2aWNlICpwYXJlbnQsCiAJc3ctPmdldCA9IGRlc2MtPmdldDsKIAogCXN3LT5kZXYucGFy ZW50ID0gcGFyZW50OworCXN3LT5kZXYuZndub2RlID0gZGVzYy0+Zndub2RlOwogCXN3LT5kZXYu Y2xhc3MgPSByb2xlX2NsYXNzOwogCXN3LT5kZXYudHlwZSA9ICZ1c2Jfcm9sZV9kZXZfdHlwZTsK IAlkZXZfc2V0X25hbWUoJnN3LT5kZXYsICIlcy1yb2xlLXN3aXRjaCIsIGRldl9uYW1lKHBhcmVu dCkpOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC91c2Ivcm9sZS5oIGIvaW5jbHVkZS9saW51 eC91c2Ivcm9sZS5oCmluZGV4IGVkYzUxYmU0YTc3Yy4uOTY4NGE4NzM0NzU3IDEwMDY0NAotLS0g YS9pbmNsdWRlL2xpbnV4L3VzYi9yb2xlLmgKKysrIGIvaW5jbHVkZS9saW51eC91c2Ivcm9sZS5o CkBAIC0zMiw2ICszMiw3IEBAIHR5cGVkZWYgZW51bSB1c2Jfcm9sZSAoKnVzYl9yb2xlX3N3aXRj aF9nZXRfdCkoc3RydWN0IGRldmljZSAqZGV2KTsKICAqIHVzYl9yb2xlX3N3aXRjaF9yZWdpc3Rl cigpIGJlZm9yZSByZWdpc3RlcmluZyB0aGUgc3dpdGNoLgogICovCiBzdHJ1Y3QgdXNiX3JvbGVf c3dpdGNoX2Rlc2MgeworCXN0cnVjdCBmd25vZGVfaGFuZGxlICpmd25vZGU7CiAJc3RydWN0IGRl dmljZSAqdXNiMl9wb3J0OwogCXN0cnVjdCBkZXZpY2UgKnVzYjNfcG9ydDsKIAlzdHJ1Y3QgZGV2 aWNlICp1ZGM7Cg==