diff for duplicates of <1054846559915@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 485efa2..8b6ce46 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -139,8 +139,8 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c + } + /* If Winbond SMBus, check address at 0x48. + Asus doesn't support */ - if ((!is_isa) && (((!(val1 & 0x80)) && (val2 = 0xa3)) || - ((val1 & 0x80) && (val2 = 0x5c)))) { + if ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) || + ((val1 & 0x80) && (val2 == 0x5c)))) { if (w83781d_read_value - (new_client, W83781D_REG_I2C_ADDR) != address) + (new_client, W83781D_REG_I2C_ADDR) != address) { @@ -152,7 +152,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c @@ -1239,8 +1259,11 @@ vendid = winbond; - else if ((val2 = 0x12) || (val2 = 0x06)) + else if ((val2 == 0x12) || (val2 == 0x06)) vendid = asus; - else + else { @@ -161,7 +161,8 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c + } + /* mask off lower bit, not reliable */ - val1 w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe; + val1 = + w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe; @@ -1262,6 +1285,7 @@ "Ignoring 'force' parameter for unknown chip at" "adapter %d, address 0x%02x\n", @@ -171,7 +172,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c } } @@ -1279,7 +1303,9 @@ - } else if (kind = w83697hf) { + } else if (kind == w83697hf) { client_name = "W83697HF chip"; } else { - dev_err(&new_client->dev, "Internal error: unknown kind (%d)?!?", kind); diff --git a/a/content_digest b/N1/content_digest index deb2d77..c19097c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\010548465592184@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes for 2.5.70\0" - "Date\0Thu, 19 May 2005 06:23:58 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes for 2.5.70\0" + "Date\0Thu, 5 Jun 2003 13:55:59 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -147,8 +147,8 @@ "+\t\t}\n" "+\t\t/* If Winbond SMBus, check address at 0x48.\n" "+\t\t Asus doesn't support */\n" - " \t\tif ((!is_isa) && (((!(val1 & 0x80)) && (val2 = 0xa3)) ||\n" - " \t\t\t\t ((val1 & 0x80) && (val2 = 0x5c)))) {\n" + " \t\tif ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) ||\n" + " \t\t\t\t ((val1 & 0x80) && (val2 == 0x5c)))) {\n" " \t\t\tif (w83781d_read_value\n" "-\t\t\t (new_client, W83781D_REG_I2C_ADDR) != address)\n" "+\t\t\t (new_client, W83781D_REG_I2C_ADDR) != address) {\n" @@ -160,7 +160,7 @@ " \n" "@@ -1239,8 +1259,11 @@\n" " \t\t\tvendid = winbond;\n" - " \t\telse if ((val2 = 0x12) || (val2 = 0x06))\n" + " \t\telse if ((val2 == 0x12) || (val2 == 0x06))\n" " \t\t\tvendid = asus;\n" "-\t\telse\n" "+\t\telse {\n" @@ -169,7 +169,8 @@ "+\t\t}\n" "+\n" " \t\t/* mask off lower bit, not reliable */\n" - " \t\tval1 \t\t w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe;\n" + " \t\tval1 =\n" + " \t\t w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe;\n" "@@ -1262,6 +1285,7 @@\n" " \t\t\t\t \"Ignoring 'force' parameter for unknown chip at\"\n" " \t\t\t\t \"adapter %d, address 0x%02x\\n\",\n" @@ -179,7 +180,7 @@ " \t\t}\n" " \t}\n" "@@ -1279,7 +1303,9 @@\n" - " \t} else if (kind = w83697hf) {\n" + " \t} else if (kind == w83697hf) {\n" " \t\tclient_name = \"W83697HF chip\";\n" " \t} else {\n" "-\t\tdev_err(&new_client->dev, \"Internal error: unknown kind (%d)?!?\", kind);\n" @@ -189,4 +190,4 @@ " \t\tgoto ERROR2;\n" " \t}" -2c5d8210154093b0a53e14dfb5c963b8f0f0893d53f664b557db4663765a4e75 +2673101fccae29ea76695dfd9f3918db125636e147d868567bc31442cae5a664
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.