From a226740008a7eeba08309ecbcb4fa19306d8c766 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Fri, 18 Sep 2009 12:59:22 -0700
Subject: [PATCH] --- yaml --- r: 175173 b: refs/heads/master c:
 05d42522017df477f16c0ebc2d65aa8bde6e0e86 h: refs/heads/master i:   175171:
 1278cd88cdc98da1b244b3bbf245ab70e6abfdd5 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/dream/synaptics_i2c_rmi.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4b540c007b35..682665cc10da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7fa31849c237b0bbcc03cd65536f0060ee6117d
+refs/heads/master: 05d42522017df477f16c0ebc2d65aa8bde6e0e86
diff --git a/trunk/drivers/staging/dream/synaptics_i2c_rmi.c b/trunk/drivers/staging/dream/synaptics_i2c_rmi.c
index ae696d3bc8e6..4de6bc917595 100644
--- a/trunk/drivers/staging/dream/synaptics_i2c_rmi.c
+++ b/trunk/drivers/staging/dream/synaptics_i2c_rmi.c
@@ -379,6 +379,12 @@ static int __devinit synaptics_ts_probe(
 		goto err_check_functionality_failed;
 	}
 
+	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA)) {
+		pr_err("synaptics_ts_probe: need I2C_FUNC_SMBUS_WORD_DATA\n");
+		ret = -ENODEV;
+		goto err_check_functionality_failed;
+	}
+
 	ts = kzalloc(sizeof(*ts), GFP_KERNEL);
 	if (ts == NULL) {
 		ret = -ENOMEM;