Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bd5abd9 authored by Corey Minyard's avatar Corey Minyard Committed by Greg Kroah-Hartman
Browse files

i2c: smbus: Don't filter out duplicate alerts 



[ Upstream commit dca0dd28fa5e0a1ec41a623dbaf667601fc62331 ]

Getting the same alert twice in a row is legal and normal,
especially on a fast device (like running in qemu).  Kind of
like interrupts.  So don't report duplicate alerts, and deliver
them normally.

[JD: Fixed subject]

Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Stable-dep-of: 37c526f00bc1 ("i2c: smbus: Improve handling of stuck alerts")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ba9a332d

drivers/i2c/i2c-smbus.c

+0 −7
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static irqreturn_t smbus_alert(int irq, void *d) 
{

	struct i2c_smbus_alert *alert = d;

	struct i2c_client *ara;

	unsigned short prev_addr = 0;	/* Not a valid address */



	ara = alert->ara;
@@ -90,18 +89,12 @@ static irqreturn_t smbus_alert(int irq, void *d) 
		data.addr = status >> 1;

		data.type = I2C_PROTOCOL_SMBUS_ALERT;



		if (data.addr == prev_addr) {

			dev_warn(&ara->dev, "Duplicate SMBALERT# from dev "

				"0x%02x, skipping\n", data.addr);

			break;

		}

		dev_dbg(&ara->dev, "SMBALERT# from dev 0x%02x, flag %d\n",

			data.addr, data.data);



		/* Notify driver for the device which issued the alert */

		device_for_each_child(&ara->adapter->dev, &data,

				      smbus_do_alert);

		prev_addr = data.addr;

	}



	return IRQ_HANDLED;