diff for duplicates of <10642734193216@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 8acf8e0..8848eef 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -216,7 +216,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c + + /* Determine the address of the SMBus areas */ + pci_read_config_word(SIS5595_dev, ACPI_BASE, &sis5595_base); -+ if (sis5595_base = 0 && force_addr = 0) { ++ if (sis5595_base == 0 && force_addr == 0) { + dev_err(&SIS5595_dev->dev, "ACPI base address uninitialized - upgrade BIOS or use force_addr=0xaddr\n"); + return -ENODEV; + } @@ -248,13 +248,13 @@ diff -Nru a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c + + if (!pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val)) + goto error; -+ if ((val & 0x80) = 0) { ++ if ((val & 0x80) == 0) { + dev_info(&SIS5595_dev->dev, "enabling ACPI\n"); + if (!pci_write_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, val | 0x80)) + goto error; + if (!pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val)) + goto error; -+ if ((val & 0x80) = 0) { ++ if ((val & 0x80) == 0) { + /* doesn't work for some chips? */ + dev_err(&SIS5595_dev->dev, "ACPI enable failed - not supported?\n"); + goto error; @@ -341,14 +341,14 @@ diff -Nru a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c + break; + case I2C_SMBUS_BYTE: + sis5595_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01)); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + sis5595_write(SMB_CMD, command); + size = SIS5595_BYTE; + break; + case I2C_SMBUS_BYTE_DATA: + sis5595_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01)); + sis5595_write(SMB_CMD, command); -+ if (read_write = I2C_SMBUS_WRITE) ++ if (read_write == I2C_SMBUS_WRITE) + sis5595_write(SMB_BYTE, data->byte); + size = SIS5595_BYTE_DATA; + break; @@ -356,12 +356,12 @@ diff -Nru a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c + case I2C_SMBUS_WORD_DATA: + sis5595_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01)); + sis5595_write(SMB_CMD, command); -+ if (read_write = I2C_SMBUS_WRITE) { ++ if (read_write == I2C_SMBUS_WRITE) { + sis5595_write(SMB_BYTE, data->word & 0xff); + sis5595_write(SMB_BYTE + 1, + (data->word & 0xff00) >> 8); + } -+ size = (size = I2C_SMBUS_PROC_CALL) ? SIS5595_PROC_CALL : SIS5595_WORD_DATA; ++ size = (size == I2C_SMBUS_PROC_CALL) ? SIS5595_PROC_CALL : SIS5595_WORD_DATA; + break; +/* + case I2C_SMBUS_BLOCK_DATA: @@ -381,7 +381,7 @@ diff -Nru a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c + return -1; + + if ((size != SIS5595_PROC_CALL) && -+ ((read_write = I2C_SMBUS_WRITE) || (size = SIS5595_QUICK))) ++ ((read_write == I2C_SMBUS_WRITE) || (size == SIS5595_QUICK))) + return 0; + + diff --git a/a/content_digest b/N1/content_digest index e7d37de..19bed29 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010642734191753@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:17 +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:19 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -225,7 +224,7 @@ "+\n" "+\t/* Determine the address of the SMBus areas */\n" "+\tpci_read_config_word(SIS5595_dev, ACPI_BASE, &sis5595_base);\n" - "+\tif (sis5595_base = 0 && force_addr = 0) {\n" + "+\tif (sis5595_base == 0 && force_addr == 0) {\n" "+\t\tdev_err(&SIS5595_dev->dev, \"ACPI base address uninitialized - upgrade BIOS or use force_addr=0xaddr\\n\");\n" "+\t\treturn -ENODEV;\n" "+\t}\n" @@ -257,13 +256,13 @@ "+\n" "+\tif (!pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val))\n" "+\t\tgoto error;\n" - "+\tif ((val & 0x80) = 0) {\n" + "+\tif ((val & 0x80) == 0) {\n" "+\t\tdev_info(&SIS5595_dev->dev, \"enabling ACPI\\n\");\n" "+\t\tif (!pci_write_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, val | 0x80))\n" "+\t\t\tgoto error;\n" "+\t\tif (!pci_read_config_byte(SIS5595_dev, SIS5595_ENABLE_REG, &val))\n" "+\t\t\tgoto error;\n" - "+\t\tif ((val & 0x80) = 0) {\n" + "+\t\tif ((val & 0x80) == 0) {\n" "+\t\t\t/* doesn't work for some chips? */\n" "+\t\t\tdev_err(&SIS5595_dev->dev, \"ACPI enable failed - not supported?\\n\");\n" "+\t\t\tgoto error;\n" @@ -350,14 +349,14 @@ "+\t\tbreak;\n" "+\tcase I2C_SMBUS_BYTE:\n" "+\t\tsis5595_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\tsis5595_write(SMB_CMD, command);\n" "+\t\tsize = SIS5595_BYTE;\n" "+\t\tbreak;\n" "+\tcase I2C_SMBUS_BYTE_DATA:\n" "+\t\tsis5595_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));\n" "+\t\tsis5595_write(SMB_CMD, command);\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE)\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE)\n" "+\t\t\tsis5595_write(SMB_BYTE, data->byte);\n" "+\t\tsize = SIS5595_BYTE_DATA;\n" "+\t\tbreak;\n" @@ -365,12 +364,12 @@ "+\tcase I2C_SMBUS_WORD_DATA:\n" "+\t\tsis5595_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));\n" "+\t\tsis5595_write(SMB_CMD, command);\n" - "+\t\tif (read_write = I2C_SMBUS_WRITE) {\n" + "+\t\tif (read_write == I2C_SMBUS_WRITE) {\n" "+\t\t\tsis5595_write(SMB_BYTE, data->word & 0xff);\n" "+\t\t\tsis5595_write(SMB_BYTE + 1,\n" "+\t\t\t\t (data->word & 0xff00) >> 8);\n" "+\t\t}\n" - "+\t\tsize = (size = I2C_SMBUS_PROC_CALL) ? SIS5595_PROC_CALL : SIS5595_WORD_DATA;\n" + "+\t\tsize = (size == I2C_SMBUS_PROC_CALL) ? SIS5595_PROC_CALL : SIS5595_WORD_DATA;\n" "+\t\tbreak;\n" "+/*\n" "+\tcase I2C_SMBUS_BLOCK_DATA:\n" @@ -390,7 +389,7 @@ "+\t\treturn -1;\n" "+\n" "+\tif ((size != SIS5595_PROC_CALL) &&\n" - "+\t ((read_write = I2C_SMBUS_WRITE) || (size = SIS5595_QUICK)))\n" + "+\t ((read_write == I2C_SMBUS_WRITE) || (size == SIS5595_QUICK)))\n" "+\t\treturn 0;\n" "+\n" "+\n" @@ -480,4 +479,4 @@ "+module_init(i2c_sis5595_init);\n" +module_exit(i2c_sis5595_exit); -32eb922dd08342f481ec26c60715604271e4db0e1f3ced2943d9c216e7756854 +11d49fba95e232f7f9813002cc7398772b528dae46d8b17c5aff8660b5cbf43c
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.