From: Oliver Hartkopp <socketcan@hartkopp.net>
To: "linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Cc: Wolfgang Grandegger <wg@grandegger.com>,
Kurt Van Dijck <kurt.van.dijck@eia.be>
Subject: Re: can: fix sja1000 post_irq handling and resulting return value
Date: Thu, 21 Nov 2013 18:07:05 +0100 [thread overview]
Message-ID: <528E3DB9.6020809@hartkopp.net> (raw)
In-Reply-To: <528E3CCB.9080501@hartkopp.net>
On 21.11.2013 18:03, Oliver Hartkopp wrote:
> This patch fixes the issue that the sja1000_interrupt() function may have
> returned IRQ_NONE without processing the optional post_irq function before.
> Additionally the irq processing counter 'n' is moved to the end of the while
> statement to return correct IRQ_[NONE|HANDLED] values at error conditions.
>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
8-)
> ---
>
> diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
> index 7164a99..f17c301 100644
> --- a/drivers/net/can/sja1000/sja1000.c
> +++ b/drivers/net/can/sja1000/sja1000.c
> @@ -494,20 +494,20 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
> uint8_t isrc, status;
> int n = 0;
>
> - /* Shared interrupts and IRQ off? */
> - if (priv->read_reg(priv, SJA1000_IER) == IRQ_OFF)
> - return IRQ_NONE;
> -
> if (priv->pre_irq)
> priv->pre_irq(priv);
>
> + /* Shared interrupts and IRQ off? */
> + if (priv->read_reg(priv, SJA1000_IER) == IRQ_OFF)
> + goto out;
> +
> while ((isrc = priv->read_reg(priv, SJA1000_IR)) &&
> (n < SJA1000_MAX_IRQ)) {
> - n++;
> +
> status = priv->read_reg(priv, SJA1000_SR);
> /* check for absent controller due to hw unplug */
> if (status == 0xFF && sja1000_is_absent(priv))
> - return IRQ_NONE;
> + goto out;
>
> if (isrc & IRQ_WUI)
> netdev_warn(dev, "wakeup interrupt\n");
> @@ -535,7 +535,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
> status = priv->read_reg(priv, SJA1000_SR);
> /* check for absent controller */
> if (status == 0xFF && sja1000_is_absent(priv))
> - return IRQ_NONE;
> + goto out;
> }
> }
> if (isrc & (IRQ_DOI | IRQ_EI | IRQ_BEI | IRQ_EPI | IRQ_ALI)) {
> @@ -543,8 +543,9 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
> if (sja1000_err(dev, isrc, status))
> break;
> }
> + n++;
> }
> -
> +out:
> if (priv->post_irq)
> priv->post_irq(priv);
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-can" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
prev parent reply other threads:[~2013-11-21 17:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 17:03 can: fix sja1000 post_irq handling and resulting return value Oliver Hartkopp
2013-11-21 17:07 ` Oliver Hartkopp [this message]
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=528E3DB9.6020809@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=kurt.van.dijck@eia.be \
--cc=linux-can@vger.kernel.org \
--cc=wg@grandegger.com \
/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;
as well as URLs for NNTP newsgroup(s).