diff for duplicates of <11123113891852@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 3d493ce..69ac80b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,13 +37,13 @@ diff -Nru a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c @@ -121,13 +122,15 @@ spin_lock_irqsave(&lock, flags); - if (iic_pending = 0) { + if (iic_pending == 0) { spin_unlock_irqrestore(&lock, flags); - if (interruptible_sleep_on_timeout(&iic_wait, timeout*HZ)) { + prepare_to_wait(&iic_wait, &wait, TASK_INTERRUPTIBLE); + if (schedule_timeout(timeout*HZ)) { spin_lock_irqsave(&lock, flags); - if (iic_pending = 1) { + if (iic_pending == 1) { iic_pending = 0; } spin_unlock_irqrestore(&lock, flags); diff --git a/a/content_digest b/N1/content_digest index dd5eb97..c20e926 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050331232230.GA2614@kroah.com\0" - "From\0gregkh@suse.de (Greg KH)\0" + "From\0Greg KH <gregkh@suse.de>\0" "Subject\0[PATCH] i2c/i2c-ite: remove interruptible_sleep_on_timeout() usage\0" - "Date\0Thu, 19 May 2005 06:25:47 +0000\0" + "Date\0Thu, 31 Mar 2005 15:23:09 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "Cc\0domen@coderock.org\0" @@ -46,13 +46,13 @@ " \n" "@@ -121,13 +122,15 @@\n" " \tspin_lock_irqsave(&lock, flags);\n" - " \tif (iic_pending = 0) {\n" + " \tif (iic_pending == 0) {\n" " \t\tspin_unlock_irqrestore(&lock, flags);\n" "-\t\tif (interruptible_sleep_on_timeout(&iic_wait, timeout*HZ)) {\n" "+\t\tprepare_to_wait(&iic_wait, &wait, TASK_INTERRUPTIBLE);\n" "+\t\tif (schedule_timeout(timeout*HZ)) {\n" " \t\t\tspin_lock_irqsave(&lock, flags);\n" - " \t\t\tif (iic_pending = 1) {\n" + " \t\t\tif (iic_pending == 1) {\n" " \t\t\t\tiic_pending = 0;\n" " \t\t\t}\n" " \t\t\tspin_unlock_irqrestore(&lock, flags);\n" @@ -62,4 +62,4 @@ " \t\tiic_pending = 0;\n" " \t\tspin_unlock_irqrestore(&lock, flags);" -0f33d57e18bc4bf3af58ddd725a85f80bd774fdd52cc68e3297401945f863898 +10192daf591f6c06dc84e8a2ab777bdb85ee1974636d98357e7dd9a5a7b1d919
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.