[wrecked] synaptics-touchscreen-for-htc-dream-check-that-smbus-is-available.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Synaptics touchscreen for HTC Dream: check that smbus is available
has been removed from the -mm tree.  Its filename was
     synaptics-touchscreen-for-htc-dream-check-that-smbus-is-available.patch

This patch was dropped because other changes were merged, which wrecked this patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: Synaptics touchscreen for HTC Dream: check that smbus is available
From: Pavel Machek <pavel@xxxxxx>

Check that SMBUS APIs are available in touchscreen driver.
    
Signed-off-by: Pavel Machek <pavel@xxxxxx>
Cc: Trilok Soni <soni.trilok@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: <arve@xxxxxxxxxxx>
Cc: Brian Swetland <swetland@xxxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

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

diff -puN drivers/staging/dream/synaptics_i2c_rmi.c~synaptics-touchscreen-for-htc-dream-check-that-smbus-is-available drivers/staging/dream/synaptics_i2c_rmi.c
--- a/drivers/staging/dream/synaptics_i2c_rmi.c~synaptics-touchscreen-for-htc-dream-check-that-smbus-is-available
+++ a/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;
_

Patches currently in -mm which might be from pavel@xxxxxx are

origin.patch
linux-next.patch
synaptics-touchscreen-for-htc-dream-check-that-smbus-is-available.patch
scripts-get_maintainerpl-add-roles-and-rolestats.patch
scripts-get_maintainerpl-fix-non-with-git-blame-and-cleanups.patch
lis3lv02d-axis-remap-and-resource-setup-release.patch
lis3lv02d-i2c-support.patch
fatfs-use-common-time_to_tm-in-fat_time_unix2fat.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux