[PATCH v2 09/10] i2c: i801: warn on i2c_handle_smbus_host_notify() errors
From: Benjamin Tissoires <hidden>
Date: 2016-08-19 13:29:43
Also in:
lkml
Subsystem:
i2c subsystem, i2c subsystem host drivers, i2c/smbus controller drivers for pc, the rest · Maintainers:
Wolfram Sang, Andi Shyti, Jean Delvare, Linus Torvalds
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 <redacted> Signed-off-by: Benjamin Tissoires <redacted> --- 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