From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Jean Delvare <jdelvare@suse.com>, Wolfram Sang <wsa@the-dreams.de>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 09/10] i2c: i801: warn on i2c_handle_smbus_host_notify() errors
Date: Fri, 19 Aug 2016 15:27:41 +0200 [thread overview]
Message-ID: <1471613262-20682-10-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1471613262-20682-1-git-send-email-benjamin.tissoires@redhat.com>
There is a chance we get called while Host Notify is not available (yet),
so we need to clear the Host Notify bit in those rare case.
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
no changes in v2 (comments addressed in the previous patches)
---
drivers/i2c/busses/i2c-i801.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 74fb144..c5ed44c 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -579,12 +579,21 @@ static irqreturn_t i801_host_notify_isr(struct i801_priv *priv)
{
unsigned short addr;
unsigned int data;
+ int ret;
+
+ if (unlikely(!priv->host_notify))
+ goto out;
addr = inb_p(SMBNTFDADD(priv)) >> 1;
data = inw_p(SMBNTFDDAT(priv));
- i2c_handle_smbus_host_notify(priv->host_notify, addr, data);
+ ret = i2c_handle_smbus_host_notify(priv->host_notify, addr, data);
+ if (ret < 0)
+ dev_warn(&priv->pci_dev->dev,
+ "Host Notify handling failed: %d\n", ret);
+
+out:
/* clear Host Notify bit and return */
outb_p(SMBSLVSTS_HST_NTFY_STS, SMBSLVSTS(priv));
return IRQ_HANDLED;
--
2.5.5
next prev parent reply other threads:[~2016-08-19 13:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-19 13:27 [PATCH v2 00/10] i2c: Host Notify / i801 fixes Benjamin Tissoires
2016-08-19 13:27 ` [PATCH v2 01/10] i2c: i2c-smbus: prevent races on remove when Host Notify is used Benjamin Tissoires
2016-08-19 13:27 ` [PATCH v2 02/10] i2c: i801: store and restore the SLVCMD register at load and unload Benjamin Tissoires
2016-08-19 13:27 ` [PATCH v2 03/10] i2c: i801: minor formatting issues Benjamin Tissoires
2016-08-19 13:27 ` [PATCH v2 04/10] i2c: i801: use BIT() macro for bits definition Benjamin Tissoires
2016-08-19 13:27 ` [PATCH v2 05/10] i2c: i801: use the BIT() macro for FEATURES_* also Benjamin Tissoires
2016-08-19 13:27 ` [PATCH v2 06/10] i2c: i801: do not report an error if FEATURE_HOST_NOTIFY is not set Benjamin Tissoires
2016-08-19 13:27 ` [PATCH v2 07/10] i2c: i2c-smbus: remove double warning message Benjamin Tissoires
2016-08-19 13:27 ` [PATCH v2 08/10] i2c: i2c-smbus: fix return value of i2c_handle_smbus_host_notify() Benjamin Tissoires
2016-08-19 13:27 ` Benjamin Tissoires [this message]
2016-08-19 13:27 ` [PATCH v2 10/10] i2c: i801: remove SMBNTFDDAT reads as they always seem to return 0 Benjamin Tissoires
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=1471613262-20682-10-git-send-email-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=jdelvare@suse.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/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).