diff for duplicates of <1084577357958@kroah.com> diff --git a/a/1.txt b/N1/1.txt index e7bec75..7192564 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ affected, since most of them don't handle the beep mask as far as I can tell. This also close Debian bug #209299: -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug 9299 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=209299 Successfully tested on my AS99127F rev.1 chip. Aurelien Jarno also checked that there were no regression on non-Asus chips. @@ -35,9 +35,9 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c #define PWM_TO_REG(val) (SENSORS_LIMIT((val),0,255)) -#define BEEP_MASK_FROM_REG(val) (val) -#define BEEP_MASK_TO_REG(val) ((val) & 0xffffff) -+#define BEEP_MASK_FROM_REG(val,type) ((type) = as99127f ? \ ++#define BEEP_MASK_FROM_REG(val,type) ((type) == as99127f ? \ + (val) ^ 0x7fff : (val)) -+#define BEEP_MASK_TO_REG(val,type) ((type) = as99127f ? \ ++#define BEEP_MASK_TO_REG(val,type) ((type) == as99127f ? \ + (~(val)) & 0x7fff : (val) & 0xffffff) #define BEEP_ENABLE_TO_REG(val) ((val) ? 1 : 0) @@ -71,7 +71,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c @@ -562,7 +568,7 @@ val = simple_strtoul(buf, NULL, 10); - if (update_mask = BEEP_MASK) { /* We are storing beep_mask */ + if (update_mask == BEEP_MASK) { /* We are storing beep_mask */ - data->beep_mask = BEEP_MASK_TO_REG(val); + data->beep_mask = BEEP_MASK_TO_REG(val, data->type); w83781d_write_value(client, W83781D_REG_BEEP_INTS1, diff --git a/a/content_digest b/N1/content_digest index fb81e11..3a99c9e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\01084577357292@kroah.com\0" - "ref\010845773562431@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] I2C update for 2.6.6\0" - "Date\0Thu, 19 May 2005 06:24:57 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] I2C update for 2.6.6\0" + "Date\0Fri, 14 May 2004 16:29:17 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -25,7 +24,7 @@ "tell.\n" "\n" "This also close Debian bug #209299:\n" - "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug 9299\n" + "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=209299\n" "\n" "Successfully tested on my AS99127F rev.1 chip. Aurelien Jarno also\n" "checked that there were no regression on non-Asus chips.\n" @@ -44,9 +43,9 @@ " #define PWM_TO_REG(val)\t\t\t(SENSORS_LIMIT((val),0,255))\n" "-#define BEEP_MASK_FROM_REG(val)\t\t(val)\n" "-#define BEEP_MASK_TO_REG(val)\t\t((val) & 0xffffff)\n" - "+#define BEEP_MASK_FROM_REG(val,type)\t((type) = as99127f ? \\\n" + "+#define BEEP_MASK_FROM_REG(val,type)\t((type) == as99127f ? \\\n" "+\t\t\t\t\t (val) ^ 0x7fff : (val))\n" - "+#define BEEP_MASK_TO_REG(val,type)\t((type) = as99127f ? \\\n" + "+#define BEEP_MASK_TO_REG(val,type)\t((type) == as99127f ? \\\n" "+\t\t\t\t\t (~(val)) & 0x7fff : (val) & 0xffffff)\n" " \n" " #define BEEP_ENABLE_TO_REG(val)\t\t((val) ? 1 : 0)\n" @@ -80,10 +79,10 @@ "@@ -562,7 +568,7 @@\n" " \tval = simple_strtoul(buf, NULL, 10);\n" " \n" - " \tif (update_mask = BEEP_MASK) {\t/* We are storing beep_mask */\n" + " \tif (update_mask == BEEP_MASK) {\t/* We are storing beep_mask */\n" "-\t\tdata->beep_mask = BEEP_MASK_TO_REG(val);\n" "+\t\tdata->beep_mask = BEEP_MASK_TO_REG(val, data->type);\n" " \t\tw83781d_write_value(client, W83781D_REG_BEEP_INTS1,\n" " \t\t\t\t data->beep_mask & 0xff);" -f75d426bc1dd0ed4e15325587bbd4855c96b18430516648e791fe9043d5ede6b +68229932e036c03ec9be3cd394de6192b6487e97d1ece0549d0d8428378a54bc
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.