- rtc-pcf8583-check-for-i2c-adapter-functionality.patch removed from -mm tree

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

 



The patch titled
     rtc-pcf8583: Check for i2c adapter functionality
has been removed from the -mm tree.  Its filename was
     rtc-pcf8583-check-for-i2c-adapter-functionality.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: rtc-pcf8583: Check for i2c adapter functionality
From: Jean Delvare <khali@xxxxxxxxxxxx>

Not all i2c adapters support I2C-level messaging.  Check that the adapter
does before probing for a PCF8583 chip, as the driver makes use of
i2c_transfer and i2c_master_send.

Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Signed-off-by: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/rtc/rtc-pcf8583.c |    3 +++
 1 file changed, 3 insertions(+)

diff -puN drivers/rtc/rtc-pcf8583.c~rtc-pcf8583-check-for-i2c-adapter-functionality drivers/rtc/rtc-pcf8583.c
--- a/drivers/rtc/rtc-pcf8583.c~rtc-pcf8583-check-for-i2c-adapter-functionality
+++ a/drivers/rtc/rtc-pcf8583.c
@@ -332,6 +332,9 @@ static int pcf8583_probe(struct i2c_adap
 		}
 	};
 
+	if (!i2c_check_functionality(adap, I2C_FUNC_I2C))
+		return 0;
+
 	pcf = kzalloc(sizeof(*pcf), GFP_KERNEL);
 	if (!pcf)
 		return -ENOMEM;
_

Patches currently in -mm which might be from khali@xxxxxxxxxxxx are

origin.patch
git-acpi.patch
git-hwmon.patch
applesmc-for-mac-pro-2-x-quad-core.patch
applesmc-for-mac-pro-2-x-quad-core-fix.patch
git-ieee1394.patch
make-the-pr_-family-of-macros-in-kernelh-complete.patch
i2c-pxa-rename-bit-macro-to-pxa_bit.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