diff for duplicates of <1112311394943@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 41f0316..34157e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,12 +71,12 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c status = get_pcf(adap, 1); - if (wait_for_pin(adap, &status) >= 0) { + if ((wfp = wait_for_pin(adap, &status)) >= 0) { - if ((status & I2C_PCF_LRB) = 0) { + if ((status & I2C_PCF_LRB) == 0) { i2c_stop(adap); break; /* success! */ } } -+ if (wfp = -EINTR) { ++ if (wfp == -EINTR) { + /* arbitration lost */ + udelay(adap->udelay); + return -EINTR; @@ -88,7 +88,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c i2c_outb(adap, buf[wrcount]); timeout = wait_for_pin(adap, &status); if (timeout) { -+ if (timeout = -EINTR) { ++ if (timeout == -EINTR) { + /* arbitration lost */ + return -EINTR; + } @@ -106,7 +106,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c - if (wait_for_pin(adap, &status)) { + if ((wfp = wait_for_pin(adap, &status))) { -+ if (wfp = -EINTR) { ++ if (wfp == -EINTR) { + /* arbitration lost */ + return -EINTR; + } @@ -117,7 +117,7 @@ diff -Nru a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c /* Wait for PIN (pending interrupt NOT) */ timeout = wait_for_pin(adap, &status); if (timeout) { -+ if (timeout = -EINTR) { ++ if (timeout == -EINTR) { + /* arbitration lost */ + return (-EINTR); + } diff --git a/a/content_digest b/N1/content_digest index 9c9fb04..dd92541 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\011123113933537@kroah.com\0" - "From\0gregkh@suse.de (Greg KH)\0" + "From\0Greg KH <gregkh@suse.de>\0" "Subject\0[PATCH] I2C: lost arbitration detection for PCF8584\0" - "Date\0Thu, 19 May 2005 06:25:48 +0000\0" + "Date\0Thu, 31 Mar 2005 15:23:14 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "Cc\0ebrower@gmail.com\0" @@ -80,12 +80,12 @@ " \t\tstatus = get_pcf(adap, 1);\n" "-\t\tif (wait_for_pin(adap, &status) >= 0) {\n" "+\t\tif ((wfp = wait_for_pin(adap, &status)) >= 0) {\n" - " \t\t\tif ((status & I2C_PCF_LRB) = 0) { \n" + " \t\t\tif ((status & I2C_PCF_LRB) == 0) { \n" " \t\t\t\ti2c_stop(adap);\n" " \t\t\t\tbreak;\t/* success! */\n" " \t\t\t}\n" " \t\t}\n" - "+\t\tif (wfp = -EINTR) {\n" + "+\t\tif (wfp == -EINTR) {\n" "+\t\t\t/* arbitration lost */\n" "+\t\t\tudelay(adap->udelay);\n" "+\t\t\treturn -EINTR;\n" @@ -97,7 +97,7 @@ " \t\ti2c_outb(adap, buf[wrcount]);\n" " \t\ttimeout = wait_for_pin(adap, &status);\n" " \t\tif (timeout) {\n" - "+\t\t\tif (timeout = -EINTR) {\n" + "+\t\t\tif (timeout == -EINTR) {\n" "+\t\t\t\t/* arbitration lost */\n" "+\t\t\t\treturn -EINTR;\n" "+\t\t\t}\n" @@ -115,7 +115,7 @@ " \n" "-\t\tif (wait_for_pin(adap, &status)) {\n" "+\t\tif ((wfp = wait_for_pin(adap, &status))) {\n" - "+\t\t\tif (wfp = -EINTR) {\n" + "+\t\t\tif (wfp == -EINTR) {\n" "+\t\t\t\t/* arbitration lost */\n" "+\t\t\t\treturn -EINTR;\n" "+\t\t\t}\n" @@ -126,7 +126,7 @@ " \t\t/* Wait for PIN (pending interrupt NOT) */\n" " \t\ttimeout = wait_for_pin(adap, &status);\n" " \t\tif (timeout) {\n" - "+\t\t\tif (timeout = -EINTR) {\n" + "+\t\t\tif (timeout == -EINTR) {\n" "+\t\t\t\t/* arbitration lost */\n" "+\t\t\t\treturn (-EINTR);\n" "+\t\t\t}\n" @@ -134,4 +134,4 @@ " \t\t\tDEB2(printk(KERN_ERR \"i2c-algo-pcf.o: Timeout waiting \"\n" " \t\t\t\t \"for PIN(1) in pcf_xfer\\n\");)" -e45143888f78ba22ed5b936f63562d488ad70921d19e98dff593755d2cc383a4 +d78248ee1af099ab218112bd08f38b8ab9e61ae2d467be43f5f9b8ff72039d56
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.