diff options
| author |   Jiri Kosina <jkosina@suse.com> | 2024-11-18 21:29:33 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2024-11-18 21:29:33 +0100 |
| commit | f33e46a0c6bddd341d0989484a2546bba7ac4a3c (patch) | |
| tree | 4918985ab00890205c8d77d0553472e12e01cd55 /drivers/fpga/socfpga.c | |
| parent | HID: hyperv: streamline driver probe to avoid devres issues (diff) | |
| parent | HID: wacom: Set eraser status when either 'Eraser' or 'Invert' usage is set (diff) | |
| download | wireguard-linux-f33e46a0c6bddd341d0989484a2546bba7ac4a3c.tar.xz wireguard-linux-f33e46a0c6bddd341d0989484a2546bba7ac4a3c.zip | |
Merge branch 'for-6.13/wacom' into for-linus
- Sanitization of BTN_TOOL_RUBBER handling (Jason Gerecke)
Diffstat (limited to '')
| -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); |