diff for duplicates of <11018600193653@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 1b9766b..680c581 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,13 +40,13 @@ diff -Nru a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c if (gpi.iic_irq > 0) { - cli(); + spin_lock_irqsave(&lock, flags); - if (iic_pending = 0) { + if (iic_pending == 0) { - interruptible_sleep_on_timeout(&iic_wait, timeout*HZ ); - } else + spin_unlock_irqrestore(&lock, flags); + if (interruptible_sleep_on_timeout(&iic_wait, timeout*HZ)) { + spin_lock_irqsave(&lock, flags); -+ if (iic_pending = 1) { ++ if (iic_pending == 1) { + iic_pending = 0; + } + spin_unlock_irqrestore(&lock, flags); @@ -84,6 +84,6 @@ diff -Nru a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c iic_ite_data.data = (void *)piic; init_waitqueue_head(&iic_wait); + spin_lock_init(&lock); - if (iic_hw_resrc_init() = 0) { + if (iic_hw_resrc_init() == 0) { if (i2c_iic_add_bus(&iic_ite_ops) < 0) return -ENODEV; diff --git a/a/content_digest b/N1/content_digest index f63cd3d..0982de3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01101860019530@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,13 +48,13 @@ " if (gpi.iic_irq > 0) {\n" "-\tcli();\n" "+\tspin_lock_irqsave(&lock, flags);\n" - " \tif (iic_pending = 0) {\n" + " \tif (iic_pending == 0) {\n" "-\t\tinterruptible_sleep_on_timeout(&iic_wait, timeout*HZ );\n" "-\t} else\n" "+\t\tspin_unlock_irqrestore(&lock, flags);\n" "+\t\tif (interruptible_sleep_on_timeout(&iic_wait, 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" @@ -93,8 +92,8 @@ " \tiic_ite_data.data = (void *)piic;\n" " \tinit_waitqueue_head(&iic_wait);\n" "+\tspin_lock_init(&lock);\n" - " \tif (iic_hw_resrc_init() = 0) {\n" + " \tif (iic_hw_resrc_init() == 0) {\n" " \t\tif (i2c_iic_add_bus(&iic_ite_ops) < 0)\n" " \t\t\treturn -ENODEV;" -2ef74701213445d667edab78954078f35d3d722bc04ccf5fc3c68ee0aaba49f6 +c7b707048a66d4661e8b8ccf4b2d11e2b48f39d32eafbc1d36664909aacda3ae
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.