diff for duplicates of <10819814493235@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 7f01ddb..541e5b2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,10 +49,10 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c - reg = w83781d_read_value(client, W83781D_REG_VID_FANDIV) & 0xcf; - reg |= (data->fan_div[0] & 0x03) << 4; - w83781d_write_value(client, W83781D_REG_VID_FANDIV, reg); -+ reg = (w83781d_read_value(client, nr=2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV) -+ & (nr=0 ? 0xcf : 0x3f)) -+ | ((data->fan_div[nr] & 0x03) << (nr=0 ? 4 : 6)); -+ w83781d_write_value(client, nr=2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV, reg); ++ reg = (w83781d_read_value(client, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV) ++ & (nr==0 ? 0xcf : 0x3f)) ++ | ((data->fan_div[nr] & 0x03) << (nr==0 ? 4 : 6)); ++ w83781d_write_value(client, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV, reg); /* w83781d and as99127f don't have extended divisor bits */ if (data->type != w83781d && data->type != as99127f) { diff --git a/a/content_digest b/N1/content_digest index c6e8ee9..7c21632 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\020040414222215.GA26225@kroah.com\0" - "ref\010819814492866@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] I2C update for 2.6.5\0" - "Date\0Thu, 19 May 2005 06:24:52 +0000\0" + "Date\0Wed, 14 Apr 2004 15:24:09 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -58,10 +57,10 @@ "-\treg = w83781d_read_value(client, W83781D_REG_VID_FANDIV) & 0xcf;\n" "-\treg |= (data->fan_div[0] & 0x03) << 4;\n" "-\tw83781d_write_value(client, W83781D_REG_VID_FANDIV, reg);\n" - "+\treg = (w83781d_read_value(client, nr=2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV)\n" - "+\t & (nr=0 ? 0xcf : 0x3f))\n" - "+\t | ((data->fan_div[nr] & 0x03) << (nr=0 ? 4 : 6));\n" - "+\tw83781d_write_value(client, nr=2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV, reg);\n" + "+\treg = (w83781d_read_value(client, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV)\n" + "+\t & (nr==0 ? 0xcf : 0x3f))\n" + "+\t | ((data->fan_div[nr] & 0x03) << (nr==0 ? 4 : 6));\n" + "+\tw83781d_write_value(client, nr==2 ? W83781D_REG_PIN : W83781D_REG_VID_FANDIV, reg);\n" " \n" " \t/* w83781d and as99127f don't have extended divisor bits */\n" " \tif (data->type != w83781d && data->type != as99127f) {\n" @@ -158,4 +157,4 @@ " } \\\n" static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, show_regs_fan_div_##offset, store_regs_fan_div_##offset) -436ddcbf82d8adbac57e3efe32ffeceee5880a1b0a296c9878023159190ba8ef +8812122b0d5b6d8dca74a2ea2f3b3e5905b99375498d455bed519107ade5bf6b
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.