diff for duplicates of <10728219701628@kroah.com> diff --git a/a/1.txt b/N1/1.txt index bbbc470..4e0a608 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,30 +38,31 @@ 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 */ + Asus doesn't support, except for as99127f rev.2 */ - 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 @@ -1295,18 +1296,17 @@ goto ERROR2; } - /* mask off lower bit, not reliable */ -- val1 - w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe; -- if (val1 = 0x10 && vendid = winbond) +- val1 = +- w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe; +- if (val1 == 0x10 && vendid == winbond) + val1 = w83781d_read_value(new_client, W83781D_REG_WCHIPID); -+ if ((val1 = 0x10 || val1 = 0x11) && vendid = winbond) ++ if ((val1 == 0x10 || val1 == 0x11) && vendid == winbond) kind = w83781d; - else if (val1 = 0x30 && vendid = winbond) + else if (val1 == 0x30 && vendid == winbond) kind = w83782d; -- else if (val1 = 0x40 && vendid = winbond && !is_isa) -+ else if (val1 = 0x40 && vendid = winbond && !is_isa -+ && address = 0x2d) +- else if (val1 == 0x40 && vendid == winbond && !is_isa) ++ else if (val1 == 0x40 && vendid == winbond && !is_isa ++ && address == 0x2d) kind = w83783s; -- else if ((val1 = 0x20 || val1 = 0x90) && vendid = winbond) -+ else if ((val1 = 0x21 || val1 = 0x90) && vendid = winbond) +- else if ((val1 == 0x20 || val1 == 0x90) && vendid == winbond) ++ else if ((val1 == 0x21 || val1 == 0x90) && vendid == winbond) kind = w83627hf; -- else if (val1 = 0x30 && vendid = asus && !is_isa) -+ else if (val1 = 0x31 && !is_isa && address >= 0x28) +- else if (val1 == 0x30 && vendid == asus && !is_isa) ++ else if (val1 == 0x31 && !is_isa && address >= 0x28) kind = as99127f; - else if (val1 = 0x60 && vendid = winbond && is_isa) + else if (val1 == 0x60 && vendid == winbond && is_isa) kind = w83697hf; diff --git a/a/content_digest b/N1/content_digest index 55267cf..e6862e0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010728219702175@kroah.com\0" - "ref\010728219692713@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.0\0" - "Date\0Thu, 19 May 2005 06:24:31 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.0\0" + "Date\0Tue, 30 Dec 2003 14:06:10 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -47,32 +46,33 @@ " \t\t/* If Winbond SMBus, check address at 0x48.\n" "-\t\t Asus doesn't support */\n" "+\t\t Asus doesn't support, except for as99127f rev.2 */\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" "@@ -1295,18 +1296,17 @@\n" " \t\t\tgoto ERROR2;\n" " \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\tif (val1 = 0x10 && vendid = winbond)\n" + "-\t\tval1 =\n" + "-\t\t w83781d_read_value(new_client, W83781D_REG_WCHIPID) & 0xfe;\n" + "-\t\tif (val1 == 0x10 && vendid == winbond)\n" "+\t\tval1 = w83781d_read_value(new_client, W83781D_REG_WCHIPID);\n" - "+\t\tif ((val1 = 0x10 || val1 = 0x11) && vendid = winbond)\n" + "+\t\tif ((val1 == 0x10 || val1 == 0x11) && vendid == winbond)\n" " \t\t\tkind = w83781d;\n" - " \t\telse if (val1 = 0x30 && vendid = winbond)\n" + " \t\telse if (val1 == 0x30 && vendid == winbond)\n" " \t\t\tkind = w83782d;\n" - "-\t\telse if (val1 = 0x40 && vendid = winbond && !is_isa)\n" - "+\t\telse if (val1 = 0x40 && vendid = winbond && !is_isa\n" - "+\t\t\t\t&& address = 0x2d)\n" + "-\t\telse if (val1 == 0x40 && vendid == winbond && !is_isa)\n" + "+\t\telse if (val1 == 0x40 && vendid == winbond && !is_isa\n" + "+\t\t\t\t&& address == 0x2d)\n" " \t\t\tkind = w83783s;\n" - "-\t\telse if ((val1 = 0x20 || val1 = 0x90) && vendid = winbond)\n" - "+\t\telse if ((val1 = 0x21 || val1 = 0x90) && vendid = winbond)\n" + "-\t\telse if ((val1 == 0x20 || val1 == 0x90) && vendid == winbond)\n" + "+\t\telse if ((val1 == 0x21 || val1 == 0x90) && vendid == winbond)\n" " \t\t\tkind = w83627hf;\n" - "-\t\telse if (val1 = 0x30 && vendid = asus && !is_isa)\n" - "+\t\telse if (val1 = 0x31 && !is_isa && address >= 0x28)\n" + "-\t\telse if (val1 == 0x30 && vendid == asus && !is_isa)\n" + "+\t\telse if (val1 == 0x31 && !is_isa && address >= 0x28)\n" " \t\t\tkind = as99127f;\n" - " \t\telse if (val1 = 0x60 && vendid = winbond && is_isa)\n" + " \t\telse if (val1 == 0x60 && vendid == winbond && is_isa)\n" " \t\t\tkind = w83697hf;" -392f9d54cacf97ccdb5386fb8baaade0c3a901818a2d9cbfe59df5687a69259f +93ea2db2037152e0b6d559487695ccdbc9179f9d664bb23b264c3902b5fdd8ef
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.