summaryrefslogtreecommitdiff
path: root/drivers/gpu/ipu-v3/ipu-dc.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-02-11 15:35:26 +1000
committerDave Airlie <airlied@redhat.com>2015-02-11 15:35:26 +1000
commit85840c76d8ad18d978da44e8d2f27bb35b7159af (patch)
treec54f837e30c81d4f30aa8eb6c9f6b764734dcd1b /drivers/gpu/ipu-v3/ipu-dc.c
parent79a44c16b155b799421f5497ae888985a5d7f80c (diff)
parenta49e7c0d079610062048a4ed1cff2bb09436127c (diff)
Merge tag 'imx-drm-fixes-2015-01-28' of git://git.pengutronix.de/git/pza/linux into drm-next
imx-drm fixes for IPUv3 DC and i.MX5 IPUv3 IC and TVE - Corrected handling of wait_for_completion_timeout return value when disabling IPUv3 DC channels - Fixed error return value propagation in TVE mode_set - Fixed IPUv3 register offsets for IC module on i.MX51 and i.MX53 * tag 'imx-drm-fixes-2015-01-28' of git://git.pengutronix.de/git/pza/linux: gpu: ipu-v3: Fix IC control register offset drm: imx: imx-tve: Check and propagate the errors gpu: ipu-v3: wait_for_completion_timeout does not return negative status
Diffstat (limited to 'drivers/gpu/ipu-v3/ipu-dc.c')
-rw-r--r--drivers/gpu/ipu-v3/ipu-dc.c5
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 323203d0503a..4864f8300797 100644
--- a/drivers/gpu/ipu-v3/ipu-dc.c
+++ b/drivers/gpu/ipu-v3/ipu-dc.c
@@ -277,7 +277,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 */
@@ -292,7 +293,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);