Attachment 45637 Details for Bug 36221 – 2.6.37 patch

[patch] 2.6.37 patch

2.6.37.diff (text/plain), 1.18 KB, created by Alex Deucher on 2011-04-14 15:31:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2011-04-14 15:31:11 UTC

Size: 1.18 KB

patch

obsolete

>--- i2c-algo-bit.c.orig	2011-04-14 18:26:27.787134602 -0400
>+++ i2c-algo-bit.c	2011-04-14 18:29:37.381619984 -0400
>@@ -232,9 +232,16 @@
>  * Sanity check for the adapter hardware - check the reaction of
>  * the bus lines only if it seems to be idle.
>  */
>-static int test_bus(struct i2c_algo_bit_data *adap, char *name)
>+static int test_bus(struct i2c_adapter *i2c_adap, char *name)
> {
>-	int scl, sda;
>+	struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
>+	int scl, sda, ret;
>+
>+	if (adap->pre_xfer) {
>+		ret = adap->pre_xfer(i2c_adap);
>+		if (ret < 0)
>+			return -ENODEV;
>+	}
> 
> 	if (adap->getscl == NULL)
> 		pr_info("%s: Testing SDA only, SCL is not readable\n", name);
>@@ -297,11 +304,19 @@
> 		       "while pulling SCL high!\n", name);
> 		goto bailout;
> 	}
>+
>+	if (adap->post_xfer)
>+		adap->post_xfer(i2c_adap);
>+
> 	pr_info("%s: Test OK\n", name);
> 	return 0;
> bailout:
> 	sdahi(adap);
> 	sclhi(adap);
>+
>+	if (adap->post_xfer)
>+		adap->post_xfer(i2c_adap);
>+
> 	return -ENODEV;
> }
> 
>@@ -605,7 +620,7 @@
> 	struct i2c_algo_bit_data *bit_adap = adap->algo_data;
> 
> 	if (bit_test) {
>-		int ret = test_bus(bit_adap, adap->name);
>+		int ret = test_bus(adap, adap->name);
> 		if (ret < 0)
> 			return -ENODEV;
> 	}

Actions: View | Splinter Review

Attachments on bug 36221: 45589 | 45590 | 45615 | 45619 | 45633 | 45636 | 45637

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.