diff options
| author |   Nicholas Mc Guire <der.herr@hofr.at> | 2015-01-19 12:38:11 +0100 |
|---|---|---|
| committer |   Philipp Zabel <p.zabel@pengutronix.de> | 2015-01-27 15:55:49 +0100 |
| commit | af7537d3c8d0f894f6499376a538e8138ef188ee (patch) | |
| tree | 71266fe3e10ccce64eada236a6d943420ea04b14 /drivers/gpu/ipu-v3/ipu-dc.c | |
| parent | Merge branch 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (diff) | |
| download | linux-dev-af7537d3c8d0f894f6499376a538e8138ef188ee.tar.xz linux-dev-af7537d3c8d0f894f6499376a538e8138ef188ee.zip | |
gpu: ipu-v3: wait_for_completion_timeout does not return negative status
This fixes up the return value handling and the return type.
Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/ipu-v3/ipu-dc.c')
| -rw-r--r-- | drivers/gpu/ipu-v3/ipu-dc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-dc.c b/drivers/gpu/ipu-v3/ipu-dc.c index 2326c752d89b..508c81d9c344 100644 --- a/drivers/gpu/ipu-v3/ipu-dc.c +++ b/drivers/gpu/ipu-v3/ipu-dc.c @@ -267,7 +267,8 @@ static irqreturn_t dc_irq_handler(int irq, void *dev_id) void ipu_dc_disable_channel(struct ipu_dc *dc) { struct ipu_dc_priv *priv = dc->priv; - int irq, ret; + int irq; + unsigned long ret; u32 val; /* TODO: Handle MEM_FG_SYNC differently from MEM_BG_SYNC */ @@ -282,7 +283,7 @@ void ipu_dc_disable_channel(struct ipu_dc *dc) enable_irq(irq); ret = wait_for_completion_timeout(&priv->comp, msecs_to_jiffies(50)); disable_irq(irq); - if (ret <= 0) { + if (ret == 0) { dev_warn(priv->dev, "DC stop timeout after 50 ms\n"); val = readl(dc->base + DC_WR_CH_CONF); |