From akpm@linux-foundation.org  Mon Oct 26 16:21:48 2009
From: Pavel Machek <pavel@ucw.cz>
Date: Fri, 18 Sep 2009 12:59:22 -0700
Subject: Staging: dream: Synaptics touchscreen for HTC Dream: check that smbus is available
To: greg@kroah.com
Cc: akpm@linux-foundation.org, pavel@ucw.cz, arve@android.com, dtor@mail.ru, soni.trilok@gmail.com, swetland@google.com
Message-ID: <200909181959.n8IJxMfp006395@imap1.linux-foundation.org>


From: Pavel Machek <pavel@ucw.cz>

Check that SMBUS APIs are available in touchscreen driver.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Cc: Trilok Soni <soni.trilok@gmail.com>
Cc: <arve@android.com>
Cc: Brian Swetland <swetland@google.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/staging/dream/synaptics_i2c_rmi.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- a/drivers/staging/dream/synaptics_i2c_rmi.c
+++ b/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;