diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2024-09-30 11:28:07 +0200 |
|---|---|---|
| committer | Jerome Brunet <jbrunet@baylibre.com> | 2024-09-30 11:28:07 +0200 |
| commit | 3fd6c59042dbba50391e30862beac979491145fe (patch) | |
| tree | 63d729254efdf6446d4d4a05e7a8a0dd803eedec /drivers/fpga/socfpga.c | |
| parent | 1d7ec62374bf049349c47f07f0b95a6524bb1b98 (diff) | |
| parent | 9852d85ec9d492ebef56dc5f229416c925758edc (diff) | |
Merge tag 'v6.12-rc1' into clk-meson-next
Linux 6.12-rc1
Diffstat (limited to 'drivers/fpga/socfpga.c')
| -rw-r--r-- | drivers/fpga/socfpga.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index 723ea0ad3f09..b08b4bb8f650 100644 --- a/drivers/fpga/socfpga.c +++ b/drivers/fpga/socfpga.c @@ -301,16 +301,17 @@ static irqreturn_t socfpga_fpga_isr(int irq, void *dev_id) static int socfpga_fpga_wait_for_config_done(struct socfpga_fpga_priv *priv) { - int timeout, ret = 0; + int ret = 0; + long time_left; socfpga_fpga_disable_irqs(priv); init_completion(&priv->status_complete); socfpga_fpga_enable_irqs(priv, SOCFPGA_FPGMGR_MON_CONF_DONE); - timeout = wait_for_completion_interruptible_timeout( + time_left = wait_for_completion_interruptible_timeout( &priv->status_complete, msecs_to_jiffies(10)); - if (timeout == 0) + if (time_left == 0) ret = -ETIMEDOUT; socfpga_fpga_disable_irqs(priv); |