Skip to content

Commit ad79c27

Browse files
committed
thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer
This is only used to write a new NVM in order to upgrade the retimer firmware. It does not make sense to expose it if upgrade is disabled. This also makes it consistent with the router NVM upgrade. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
1 parent 75749d2 commit ad79c27

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/thunderbolt/retimer.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ static int tb_retimer_nvm_add(struct tb_retimer *rt)
9393
if (ret)
9494
goto err_nvm;
9595

96-
ret = tb_nvm_add_non_active(nvm, nvm_write);
97-
if (ret)
98-
goto err_nvm;
96+
if (!rt->no_nvm_upgrade) {
97+
ret = tb_nvm_add_non_active(nvm, nvm_write);
98+
if (ret)
99+
goto err_nvm;
100+
}
99101

100102
rt->nvm = nvm;
101103
dev_dbg(&rt->dev, "NVM version %x.%x\n", nvm->major, nvm->minor);

0 commit comments

Comments
 (0)