[linux-yocto] [PATCH 3/6] [UPSTREAMED] i2c: acpi: add the delta from upstream patch

Sebastien Boeuf sebastien.boeuf at intel.com
Mon Jul 11 15:33:02 PDT 2016


From: Octavian Purdila <octavian.purdila at intel.com>

This patch adds the missing delta on initial commit from
Octavian Purdila:

	i2c: add support for ACPI reconfigure notifications

from Mika Westerberg for-eywa branch where commit id is:
f13ed6642bcfe29bcbabd87b0d8601b002d2dc1b

Signed-off-by: Octavian Purdila <octavian.purdila at intel.com>
Signed-off-by: Sebastien Boeuf <sebastien.boeuf at intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg at linux.intel.com>

Conflicts:
	drivers/i2c/i2c-core.c
---
 drivers/i2c/i2c-core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index e9fe7f3..283a4ad 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -297,6 +297,9 @@ static int acpi_i2c_notify(struct notifier_block *nb, unsigned long value,
 		acpi_i2c_register_device(adapter, adev, &info);
 		break;
 	case ACPI_RECONFIG_DEVICE_REMOVE:
+		if (!acpi_device_enumerated(adev))
+			break;
+
 		client = acpi_i2c_find_client_by_adev(adev);
 		if (!client)
 			break;
-- 
1.9.1



More information about the linux-yocto mailing list