diff for duplicates of <10642734202220@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 546600f..c466352 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -213,7 +213,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c + i2c_delay(1); + temp = sis630_read(SMB_STS); + /* check if block transmitted */ -+ if (size = SIS630_BLOCK_DATA && (temp & 0x10)) ++ if (size == SIS630_BLOCK_DATA && (temp & 0x10)) + break; + } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT)); + @@ -279,7 +279,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c + int i, len = 0, rc = 0; + u8 oldclock = 0; + -+ if (read_write = I2C_SMBUS_WRITE) { ++ if (read_write == I2C_SMBUS_WRITE) { + len = data->block[0]; + if (len < 0) + len = 0; @@ -290,13 +290,13 @@ diff -Nru a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c + dev_dbg(&adap->dev, "set data 0x%02x\n", data->block[i]); + /* set data */ + sis630_write(SMB_BYTE+(i-1)%8, data->block[i]); -+ if (i=8 || (len<8 && i=len)) { ++ if (i==8 || (len<8 && i==len)) { + dev_dbg(&adap->dev, "start trans len=%d i=%d\n",len ,i); + /* first transaction */ + if (sis630_transaction_start(adap, SIS630_BLOCK_DATA, &oldclock)) + return -1; + } -+ else if ((i-1)%8 = 7 || i=len) { ++ else if ((i-1)%8 == 7 || i==len) { + dev_dbg(&adap->dev, "trans_wait len=%d i=%d\n",len,i); + if (i>8) { + dev_dbg(&adap->dev, "clear smbary_sts len=%d i=%d\n",len,i); @@ -328,7 +328,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c + break; + } + /* if this first transaction then read byte count */ -+ if (len = 0) ++ if (len == 0) + data->block[0] = sis630_read(SMB_COUNT); + + dev_dbg(&adap->dev, "block data read len=0x%x\n", data->block[0]); @@ -362,14 +362,14 @@ diff -Nru a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c + break; + case I2C_SMBUS_BYTE: + sis630_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01)); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + sis630_write(SMB_CMD, command); + size = SIS630_BYTE; + break; + case I2C_SMBUS_BYTE_DATA: + sis630_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01)); + sis630_write(SMB_CMD, command); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + sis630_write(SMB_BYTE, data->byte); + size = SIS630_BYTE_DATA; + break; @@ -377,11 +377,11 @@ diff -Nru a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c + case I2C_SMBUS_WORD_DATA: + sis630_write(SMB_ADDR,((addr & 0x7f) << 1) | (read_write & 0x01)); + sis630_write(SMB_CMD, command); -+ if (read_write = I2C_SMBUS_WRITE) { ++ if (read_write == I2C_SMBUS_WRITE) { + sis630_write(SMB_BYTE, data->word & 0xff); + sis630_write(SMB_BYTE + 1,(data->word & 0xff00) >> 8); + } -+ size = (size = I2C_SMBUS_PROC_CALL ? SIS630_PCALL : SIS630_WORD_DATA); ++ size = (size == I2C_SMBUS_PROC_CALL ? SIS630_PCALL : SIS630_WORD_DATA); + break; + case I2C_SMBUS_BLOCK_DATA: + sis630_write(SMB_ADDR,((addr & 0x7f) << 1) | (read_write & 0x01)); @@ -398,7 +398,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c + return -1; + + if ((size != SIS630_PCALL) && -+ ((read_write = I2C_SMBUS_WRITE) || (size = SIS630_QUICK))) { ++ ((read_write == I2C_SMBUS_WRITE) || (size == SIS630_QUICK))) { + return 0; + } + diff --git a/a/content_digest b/N1/content_digest index b141ae0..16ddea4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010642734193216@kroah.com\0" - "ref\01064273416272@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.0-test5\0" - "Date\0Thu, 19 May 2005 06:24:18 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.0-test5\0" + "Date\0Mon, 22 Sep 2003 16:30:20 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -222,7 +221,7 @@ "+\t\ti2c_delay(1);\n" "+\t\ttemp = sis630_read(SMB_STS);\n" "+\t\t/* check if block transmitted */\n" - "+\t\tif (size = SIS630_BLOCK_DATA && (temp & 0x10))\n" + "+\t\tif (size == SIS630_BLOCK_DATA && (temp & 0x10))\n" "+\t\t\tbreak;\n" "+\t} while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT));\n" "+\n" @@ -288,7 +287,7 @@ "+\tint i, len = 0, rc = 0;\n" "+\tu8 oldclock = 0;\n" "+\n" - "+\tif (read_write = I2C_SMBUS_WRITE) {\n" + "+\tif (read_write == I2C_SMBUS_WRITE) {\n" "+\t\tlen = data->block[0];\n" "+\t\tif (len < 0)\n" "+\t\t\tlen = 0;\n" @@ -299,13 +298,13 @@ "+\t\t\tdev_dbg(&adap->dev, \"set data 0x%02x\\n\", data->block[i]);\n" "+\t\t\t/* set data */\n" "+\t\t\tsis630_write(SMB_BYTE+(i-1)%8, data->block[i]);\n" - "+\t\t\tif (i=8 || (len<8 && i=len)) {\n" + "+\t\t\tif (i==8 || (len<8 && i==len)) {\n" "+\t\t\t\tdev_dbg(&adap->dev, \"start trans len=%d i=%d\\n\",len ,i);\n" "+\t\t\t\t/* first transaction */\n" "+\t\t\t\tif (sis630_transaction_start(adap, SIS630_BLOCK_DATA, &oldclock))\n" "+\t\t\t\t\treturn -1;\n" "+\t\t\t}\n" - "+\t\t\telse if ((i-1)%8 = 7 || i=len) {\n" + "+\t\t\telse if ((i-1)%8 == 7 || i==len) {\n" "+\t\t\t\tdev_dbg(&adap->dev, \"trans_wait len=%d i=%d\\n\",len,i);\n" "+\t\t\t\tif (i>8) {\n" "+\t\t\t\t\tdev_dbg(&adap->dev, \"clear smbary_sts len=%d i=%d\\n\",len,i);\n" @@ -337,7 +336,7 @@ "+\t\t\t\tbreak;\n" "+\t\t\t}\n" "+\t\t\t/* if this first transaction then read byte count */\n" - "+\t\t\tif (len = 0)\n" + "+\t\t\tif (len == 0)\n" "+\t\t\t\tdata->block[0] = sis630_read(SMB_COUNT);\n" "+\n" "+\t\t\tdev_dbg(&adap->dev, \"block data read len=0x%x\\n\", data->block[0]);\n" @@ -371,14 +370,14 @@ "+\t\t\tbreak;\n" "+\t\tcase I2C_SMBUS_BYTE:\n" "+\t\t\tsis630_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));\n" - "+\t\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\t\tsis630_write(SMB_CMD, command);\n" "+\t\t\tsize = SIS630_BYTE;\n" "+\t\t\tbreak;\n" "+\t\tcase I2C_SMBUS_BYTE_DATA:\n" "+\t\t\tsis630_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));\n" "+\t\t\tsis630_write(SMB_CMD, command);\n" - "+\t\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\t\tsis630_write(SMB_BYTE, data->byte);\n" "+\t\t\tsize = SIS630_BYTE_DATA;\n" "+\t\t\tbreak;\n" @@ -386,11 +385,11 @@ "+\t\tcase I2C_SMBUS_WORD_DATA:\n" "+\t\t\tsis630_write(SMB_ADDR,((addr & 0x7f) << 1) | (read_write & 0x01));\n" "+\t\t\tsis630_write(SMB_CMD, command);\n" - "+\t\t\tif (read_write = I2C_SMBUS_WRITE) {\n" + "+\t\t\tif (read_write == I2C_SMBUS_WRITE) {\n" "+\t\t\t\tsis630_write(SMB_BYTE, data->word & 0xff);\n" "+\t\t\t\tsis630_write(SMB_BYTE + 1,(data->word & 0xff00) >> 8);\n" "+\t\t\t}\n" - "+\t\t\tsize = (size = I2C_SMBUS_PROC_CALL ? SIS630_PCALL : SIS630_WORD_DATA);\n" + "+\t\t\tsize = (size == I2C_SMBUS_PROC_CALL ? SIS630_PCALL : SIS630_WORD_DATA);\n" "+\t\t\tbreak;\n" "+\t\tcase I2C_SMBUS_BLOCK_DATA:\n" "+\t\t\tsis630_write(SMB_ADDR,((addr & 0x7f) << 1) | (read_write & 0x01));\n" @@ -407,7 +406,7 @@ "+\t\treturn -1;\n" "+\n" "+\tif ((size != SIS630_PCALL) &&\n" - "+\t\t((read_write = I2C_SMBUS_WRITE) || (size = SIS630_QUICK))) {\n" + "+\t\t((read_write == I2C_SMBUS_WRITE) || (size == SIS630_QUICK))) {\n" "+\t\treturn 0;\n" "+\t}\n" "+\n" @@ -556,4 +555,4 @@ "+module_init(i2c_sis630_init);\n" +module_exit(i2c_sis630_exit); -f8bdf89be08ca9871708cf82b0f2374e44570bc0e5a4e6534499109e23a43131 +a055d7edd4a7cdd7b9e92601c26540ec842b5dc79f02996b1c4a526ab3fd8771
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.