diff for duplicates of <11018600191194@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 5a32e8d..996431d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,14 +40,14 @@ diff -Nru a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c if (irq > 0) { - cli(); + spin_lock_irqsave(&lock, flags); - if (pcf_pending = 0) { + if (pcf_pending == 0) { - interruptible_sleep_on_timeout(&pcf_wait, timeout*HZ ); - } else + spin_unlock_irqrestore(&lock, flags); + if (interruptible_sleep_on_timeout(&pcf_wait, + timeout*HZ)) { + spin_lock_irqsave(&lock, flags); -+ if (pcf_pending = 1) { ++ if (pcf_pending == 1) { + pcf_pending = 0; + } + spin_unlock_irqrestore(&lock, flags); diff --git a/a/content_digest b/N1/content_digest index 5d670bb..7cbd5d8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\011018600193088@kroah.com\0" - "ref\020041119220001.GB15956@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C fixes for 2.6.10-rc2\0" - "Date\0Thu, 19 May 2005 06:25:25 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C fixes for 2.6.10-rc2\0" + "Date\0Tue, 30 Nov 2004 16:13:39 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -49,14 +48,14 @@ " \tif (irq > 0) {\n" "-\t\tcli();\n" "+\t\tspin_lock_irqsave(&lock, flags);\n" - " \t\tif (pcf_pending = 0) {\n" + " \t\tif (pcf_pending == 0) {\n" "-\t\t\tinterruptible_sleep_on_timeout(&pcf_wait, timeout*HZ );\n" "-\t\t} else\n" "+\t\t\tspin_unlock_irqrestore(&lock, flags);\n" "+\t\t\tif (interruptible_sleep_on_timeout(&pcf_wait,\n" "+\t\t\t\t\t\t\t\ttimeout*HZ)) {\n" "+\t\t\t\tspin_lock_irqsave(&lock, flags);\n" - "+\t\t\t\tif (pcf_pending = 1) {\n" + "+\t\t\t\tif (pcf_pending == 1) {\n" "+\t\t\t\t\tpcf_pending = 0;\n" "+\t\t\t\t}\n" "+\t\t\t\tspin_unlock_irqrestore(&lock, flags);\n" @@ -88,4 +87,4 @@ " \t\tif (!request_region(base, 2, \"i2c (isa bus adapter)\")) {\n" " \t\t\tprintk(KERN_ERR" -1bd74bd9415ac3ea8b7a13cc8805be5434c64606f9406e1a5cae080e8a835b9c +89263855b4b8b8a8b28a5c3de8dabab7787be6809f9b4304b6c66f03d1db369a
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.