diff for duplicates of <1053385947756@kroah.com> diff --git a/a/1.txt b/N1/1.txt index bb8f1ff..128cca8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -262,7 +262,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c + + case I2C_SMBUS_BYTE: + sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01)); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + sis96x_write(SMB_CMD, command); + size = SIS96x_BYTE; + break; @@ -270,7 +270,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c + case I2C_SMBUS_BYTE_DATA: + sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01)); + sis96x_write(SMB_CMD, command); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + sis96x_write(SMB_BYTE, data->byte); + size = SIS96x_BYTE_DATA; + break; @@ -279,11 +279,11 @@ diff -Nru a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c + case I2C_SMBUS_WORD_DATA: + sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01)); + sis96x_write(SMB_CMD, command); -+ if (read_write = I2C_SMBUS_WRITE) { ++ if (read_write == I2C_SMBUS_WRITE) { + sis96x_write(SMB_BYTE, data->word & 0xff); + sis96x_write(SMB_BYTE + 1, (data->word & 0xff00) >> 8); + } -+ size = (size = I2C_SMBUS_PROC_CALL ? ++ size = (size == I2C_SMBUS_PROC_CALL ? + SIS96x_PROC_CALL : SIS96x_WORD_DATA); + break; + @@ -303,7 +303,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c + return -1; + + if ((size != SIS96x_PROC_CALL) && -+ ((read_write = I2C_SMBUS_WRITE) || (size = SIS96x_QUICK))) ++ ((read_write == I2C_SMBUS_WRITE) || (size == SIS96x_QUICK))) + return 0; + + switch (size) { diff --git a/a/content_digest b/N1/content_digest index c3c1589..010d3d0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010533859472025@kroah.com\0" - "ref\020030323081431.GF26145@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] Yet more i2c driver changes for 2.5.69\0" - "Date\0Thu, 19 May 2005 06:23:56 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] Yet more i2c driver changes for 2.5.69\0" + "Date\0Mon, 19 May 2003 16:12:27 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -271,7 +270,7 @@ "+\n" "+\tcase I2C_SMBUS_BYTE:\n" "+\t\tsis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\tsis96x_write(SMB_CMD, command);\n" "+\t\tsize = SIS96x_BYTE;\n" "+\t\tbreak;\n" @@ -279,7 +278,7 @@ "+\tcase I2C_SMBUS_BYTE_DATA:\n" "+\t\tsis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));\n" "+\t\tsis96x_write(SMB_CMD, command);\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\tsis96x_write(SMB_BYTE, data->byte);\n" "+\t\tsize = SIS96x_BYTE_DATA;\n" "+\t\tbreak;\n" @@ -288,11 +287,11 @@ "+\tcase I2C_SMBUS_WORD_DATA:\n" "+\t\tsis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));\n" "+\t\tsis96x_write(SMB_CMD, command);\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE) {\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE) {\n" "+\t\t\tsis96x_write(SMB_BYTE, data->word & 0xff);\n" "+\t\t\tsis96x_write(SMB_BYTE + 1, (data->word & 0xff00) >> 8);\n" "+\t\t}\n" - "+\t\tsize = (size = I2C_SMBUS_PROC_CALL ? \n" + "+\t\tsize = (size == I2C_SMBUS_PROC_CALL ? \n" "+\t\t\tSIS96x_PROC_CALL : SIS96x_WORD_DATA);\n" "+\t\tbreak;\n" "+\n" @@ -312,7 +311,7 @@ "+\t\treturn -1;\n" "+\n" "+\tif ((size != SIS96x_PROC_CALL) &&\n" - "+\t\t((read_write = I2C_SMBUS_WRITE) || (size = SIS96x_QUICK)))\n" + "+\t\t((read_write == I2C_SMBUS_WRITE) || (size == SIS96x_QUICK)))\n" "+\t\treturn 0;\n" "+\n" "+\tswitch (size) {\n" @@ -535,4 +534,4 @@ " #define PCI_DEVICE_ID_SI_5300\t\t0x5300\n" " #define PCI_DEVICE_ID_SI_5511\t\t0x5511" -8dc5d366b1f838c5024ddb353b5f887da348f3dc37c44262f9fa33954e639f32 +0de7b3acc3c8f68fbd57fd34c331b9cc68b9b25030a54e06fa642863a116d879
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.