diff for duplicates of <10525245943578@kroah.com> diff --git a/a/1.txt b/N1/1.txt index b596eb8..e07e223 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,7 +26,7 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c 205-(val)*5) #define ALARMS_FROM_REG(val) (val) --#define DIV_TO_REG(val) ((val)=8?3:(val)=4?2:(val)=1?0:1) +-#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1) +static int log2(int val) +{ + int answer = 0; @@ -62,7 +62,7 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c + val = old & 0x100; + val |= (data->fan_div[0] & 0x07); + val |= (data->fan_div[1] & 0x07) << 3; -+ if (data->fan_div[2] = 3) ++ if (data->fan_div[2] == 3) + val |= 0x1 << 6; + it87_write_value(client, IT87_REG_FAN_DIV, val); return count; @@ -75,4 +75,5 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c - data->fan_div[2] = 1; + data->fan_div[2] = (i & 0x40) ? 3 : 1; - data->alarms it87_read_value(client, IT87_REG_ALARM1) | + data->alarms = + it87_read_value(client, IT87_REG_ALARM1) | diff --git a/a/content_digest b/N1/content_digest index 3a2479d..cb2e5fe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010525245942470@kroah.com\0" - "ref\01048295086481@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] 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] More i2c driver changes for 2.5.69\0" + "Date\0Fri, 9 May 2003 16:56:34 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -35,7 +34,7 @@ " \t\t\t\t205-(val)*5)\n" " #define ALARMS_FROM_REG(val) (val)\n" " \n" - "-#define DIV_TO_REG(val) ((val)=8?3:(val)=4?2:(val)=1?0:1)\n" + "-#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)\n" "+static int log2(int val)\n" "+{\n" "+\tint answer = 0;\n" @@ -71,7 +70,7 @@ "+\tval = old & 0x100;\n" "+\tval |= (data->fan_div[0] & 0x07);\n" "+\tval |= (data->fan_div[1] & 0x07) << 3;\n" - "+\tif (data->fan_div[2] = 3)\n" + "+\tif (data->fan_div[2] == 3)\n" "+\t\tval |= 0x1 << 6;\n" "+\tit87_write_value(client, IT87_REG_FAN_DIV, val);\n" " \treturn count;\n" @@ -84,6 +83,7 @@ "-\t\tdata->fan_div[2] = 1;\n" "+\t\tdata->fan_div[2] = (i & 0x40) ? 3 : 1;\n" " \n" - " \t\tdata->alarms \t\t\tit87_read_value(client, IT87_REG_ALARM1) |" + " \t\tdata->alarms =\n" + " \t\t\tit87_read_value(client, IT87_REG_ALARM1) |" -45163e40bbb425acea52e6aedfe58510abcb42a02099e7859af08bec8beeebe1 +e0956a87b140bc18b69615a04ccb0ee27b1d25abd5af3dbaacfb507a3351be09
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.