[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1444563571-12247-1-git-send-email-kieranbingham@gmail.com>
Date: Sun, 11 Oct 2015 12:39:31 +0100
From: Kieran Bingham <kieranbingham@...il.com>
To: wsa@...-dreams.de, linux-i2c@...r.kernel.org
Cc: linux-kernel@...r.kernel.org,
Kieran Bingham <kieranbingham@...il.com>
Subject: [PATCH] i2c: return probe deferred status on dev_pm_domain_attach
A change of return status was introduced in commit 3fffd1283927
("i2c: allow specifying separate wakeup interrupt in device tree")
The commit prevents the defer status being passed up the call stack
appropriately when dev_pm_domain_attach returns -EPROBE_DEFER.
To fix we change this back to the original return status;
Signed-off-by: Kieran Bingham <kieranbingham@...il.com>
---
drivers/i2c/i2c-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5f89f1e..df83015 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -701,7 +701,7 @@ static int i2c_device_probe(struct device *dev)
goto err_detach_pm_domain;
}
- return 0;
+ return status;
err_detach_pm_domain:
dev_pm_domain_detach(&client->dev, true);
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists