summaryrefslogtreecommitdiffstats
path: root/drivers/thunderbolt/dma_port.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2021-01-28 09:52:33 +0100
committerMika Westerberg <mika.westerberg@linux.intel.com>2021-01-28 10:33:06 +0100
commitf679a41fafc8cdc5c7879aa4726a28439fca7656 (patch)
tree47c9935da6206b6eb47ab48079ba58dea81aa84d /drivers/thunderbolt/dma_port.c
parentthunderbolt: Add support for de-authorizing devices (diff)
downloadlinux-f679a41fafc8cdc5c7879aa4726a28439fca7656.tar.xz
linux-f679a41fafc8cdc5c7879aa4726a28439fca7656.zip
thunderbolt: dma_port: Check 'dma_port_flash_write_block()'s return value
... and take the error path if it fails. Fixes the following W=1 kernel build warning(s): drivers/thunderbolt/dma_port.c: In function ‘dma_port_flash_write_block’: drivers/thunderbolt/dma_port.c:331:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] Cc: Andreas Noever <andreas.noever@gmail.com> Cc: Michael Jamet <michael.jamet@intel.com> Cc: Yehezkel Bernat <YehezkelShB@gmail.com> Cc: linux-usb@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/thunderbolt/dma_port.c')
-rw-r--r--drivers/thunderbolt/dma_port.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thunderbolt/dma_port.c b/drivers/thunderbolt/dma_port.c
index 847dd07a7b17..7288aaf01ae6 100644
--- a/drivers/thunderbolt/dma_port.c
+++ b/drivers/thunderbolt/dma_port.c
@@ -335,6 +335,8 @@ static int dma_port_flash_write_block(struct tb_dma_port *dma, u32 address,
/* Write the block to MAIL_DATA registers */
ret = dma_port_write(sw->tb->ctl, buf, tb_route(sw), dma->port,
dma->base + MAIL_DATA, dwords, DMA_PORT_TIMEOUT);
+ if (ret)
+ return ret;
in = MAIL_IN_CMD_FLASH_WRITE << MAIL_IN_CMD_SHIFT;