From a50e45e54ad6ce48b29de5bae280781016f5c43f Mon Sep 17 00:00:00 2001
From: "Kim, Milo" <Milo.Kim@ti.com>
Date: Thu, 17 Nov 2011 21:43:06 -0800
Subject: [PATCH] --- yaml --- r: 283459 b: refs/heads/master c:
 998a8e7a72f6a81f540d3a3774d8e8aae6c7f9f2 h: refs/heads/master i:   283457:
 1f2e0c2bdfade17524dafa9b35a609f6586c59ed   283455:
 7825c094532fe425e8bc01e436aa0f931db2356b v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/power/lp8727_charger.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 589f04fcd53e..0c32366fcfff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2165c8a45bf2fba49f54fb81a50914f883bd14df
+refs/heads/master: 998a8e7a72f6a81f540d3a3774d8e8aae6c7f9f2
diff --git a/trunk/drivers/power/lp8727_charger.c b/trunk/drivers/power/lp8727_charger.c
index 2a649e07ddde..a7e5cc2b4d74 100644
--- a/trunk/drivers/power/lp8727_charger.c
+++ b/trunk/drivers/power/lp8727_charger.c
@@ -425,6 +425,9 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 	struct lp8727_chg *pchg;
 	int ret;
 
+	if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
+		return -EIO;
+
 	pchg = kzalloc(sizeof(*pchg), GFP_KERNEL);
 	if (!pchg)
 		return -ENOMEM;