mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nicholas Mc Guire <der.herr@hofr.at>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	Lucas Stach <l.stach@pengutronix.de>,
	Emil Renner Berthing <kernel@esmil.dk>,
	Antoine Schweitzer-Chaput <antoine@schweitzer-chaput.fr>,
	linux-kernel@vger.kernel.org,
	Nicholas Mc Guire <der.herr@hofr.at>
Subject: [PATCH v2] gpu: ipu-v3: wait_for_completion_timeout does not return negative status
Date: Mon, 19 Jan 2015 12:38:11 +0100	[thread overview]
Message-ID: <1421667491-8935-1-git-send-email-der.herr@hofr.at> (raw)

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
---

This fixes up the return value handling and the return type

Patch is against 3.19.0-rc3 -next-20150109                                    
                                                                               
This patch was compiletested with imx_v6_v7_defconfig +                       
CONFIG_RESET_CONTROLLER=y, CONFIG_IMX_IPUV3_CORE=m                            

Incorrect return type reported by Philipp Zabel <p.zabel@pengutronix.de>

 drivers/gpu/ipu-v3/ipu-dc.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/ipu-v3/ipu-dc.c b/drivers/gpu/ipu-v3/ipu-dc.c
index 2326c75..508c81d 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);
-- 
1.7.10.4


             reply	other threads:[~2015-01-19 11:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-19 11:38 Nicholas Mc Guire [this message]
2015-01-22  8:39 ` Philipp Zabel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1421667491-8935-1-git-send-email-der.herr@hofr.at \
    --to=der.herr@hofr.at \
    --cc=antoine@schweitzer-chaput.fr \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel@esmil.dk \
    --cc=l.stach@pengutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=rmk+kernel@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®