summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2020-12-28 11:47:02 +0100
committerMika Westerberg <mika.westerberg@linux.intel.com>2021-03-18 16:25:32 +0100
commite23a5afd013c15909169c56751f8d7dac67a68eb (patch)
treefbe7b311aed4066b1ef70c8254e8f6104a261359
parentthunderbolt: Add KUnit tests for DMA tunnels (diff)
downloadlinux-e23a5afd013c15909169c56751f8d7dac67a68eb.tar.xz
linux-e23a5afd013c15909169c56751f8d7dac67a68eb.zip
thunderbolt: Check quirks in tb_switch_add()
This makes it more visible on the main path of adding router. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-rw-r--r--drivers/thunderbolt/eeprom.c1
-rw-r--r--drivers/thunderbolt/switch.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/thunderbolt/eeprom.c b/drivers/thunderbolt/eeprom.c
index dd03d3096653..aecb0b9f0c75 100644
--- a/drivers/thunderbolt/eeprom.c
+++ b/drivers/thunderbolt/eeprom.c
@@ -610,7 +610,6 @@ parse:
sw->uid = header->uid;
sw->vendor = header->vendor_id;
sw->device = header->model_id;
- tb_check_quirks(sw);
crc = tb_crc32(sw->drom + TB_DROM_DATA_START, header->data_len);
if (crc != header->data_crc32) {
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 71473fbb9493..321a5bcfce65 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -2522,6 +2522,8 @@ int tb_switch_add(struct tb_switch *sw)
}
tb_sw_dbg(sw, "uid: %#llx\n", sw->uid);
+ tb_check_quirks(sw);
+
ret = tb_switch_set_uuid(sw);
if (ret) {
dev_err(&sw->dev, "failed to set UUID\n");