diff for duplicates of <20090303084746.14462e04@hyperion.delvare> diff --git a/a/1.txt b/N1/1.txt index 8643914..b852936 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,7 +5,7 @@ On Mon, 2 Mar 2009 15:04:26 -0800, Andrew Morton wrote: > "Darrick J. Wong" <djwong@us.ibm.com> wrote: > > > @@ -776,7 +776,12 @@ static int lm90_detect(struct i2c_client *new_client, int kind, -> > && (reg_config1 & 0x3f) = 0x00 +> > && (reg_config1 & 0x3f) == 0x00 > > && reg_convrate <= 0x07) { > > kind = max6646; > > - } @@ -13,7 +13,7 @@ On Mon, 2 Mar 2009 15:04:26 -0800, Andrew Morton wrote: > > + /* The MAX6648/6692 chips have a working man/chip id > > + * and the same register set as the 6657. > > + */ -> > + if (chip_id = 0x59 && address = 0x4C) +> > + if (chip_id == 0x59 && address == 0x4C) > > + kind = max6657; > > } > @@ -29,15 +29,15 @@ deemed unacceptable. > --- a/drivers/hwmon/lm90.c~lm90-support-the-max6648-6692-chips-fix > +++ a/drivers/hwmon/lm90.c > @@ -776,12 +776,14 @@ static int lm90_detect(struct i2c_client -> && (reg_config1 & 0x3f) = 0x00 +> && (reg_config1 & 0x3f) == 0x00 > && reg_convrate <= 0x07) { > kind = max6646; > - } else > - /* The MAX6648/6692 chips have a working man/chip id > - * and the same register set as the 6657. > - */ -> - if (chip_id = 0x59 && address = 0x4C) -> + } else if (chip_id = 0x59 && address = 0x4C) { +> - if (chip_id == 0x59 && address == 0x4C) +> + } else if (chip_id == 0x59 && address == 0x4C) { > + /* > + * The MAX6648/6692 chips have a working > + * man/chip id and the same register set as the @@ -53,8 +53,3 @@ I thus nack this change of yours. -- Jean Delvare - -_______________________________________________ -lm-sensors mailing list -lm-sensors@lm-sensors.org -http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index 2a84443..dd3ff62 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020090302210106.GD6550@plum\0" "ref\020090302150426.b22100c1.akpm@linux-foundation.org\0" "From\0Jean Delvare <khali@linux-fr.org>\0" - "Subject\0Re: [lm-sensors] [PATCH] lm90: Support the MAX6648/6692 chips\0" - "Date\0Tue, 03 Mar 2009 07:47:46 +0000\0" + "Subject\0Re: [PATCH] lm90: Support the MAX6648/6692 chips\0" + "Date\0Tue, 3 Mar 2009 08:47:46 +0100\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0djwong@us.ibm.com" linux-kernel@vger.kernel.org @@ -16,7 +16,7 @@ "> \"Darrick J. Wong\" <djwong@us.ibm.com> wrote:\n" "> \n" "> > @@ -776,7 +776,12 @@ static int lm90_detect(struct i2c_client *new_client, int kind,\n" - "> > \t\t\t && (reg_config1 & 0x3f) = 0x00\n" + "> > \t\t\t && (reg_config1 & 0x3f) == 0x00\n" "> > \t\t\t && reg_convrate <= 0x07) {\n" "> > \t\t\t\tkind = max6646;\n" "> > -\t\t\t}\n" @@ -24,7 +24,7 @@ "> > +\t\t\t/* The MAX6648/6692 chips have a working man/chip id\n" "> > +\t\t\t * and the same register set as the 6657.\n" "> > +\t\t\t */\n" - "> > +\t\t\tif (chip_id = 0x59 && address = 0x4C)\n" + "> > +\t\t\tif (chip_id == 0x59 && address == 0x4C)\n" "> > +\t\t\t\tkind = max6657;\n" "> > \t\t}\n" "> \n" @@ -40,15 +40,15 @@ "> --- a/drivers/hwmon/lm90.c~lm90-support-the-max6648-6692-chips-fix\n" "> +++ a/drivers/hwmon/lm90.c\n" "> @@ -776,12 +776,14 @@ static int lm90_detect(struct i2c_client\n" - "> \t\t\t && (reg_config1 & 0x3f) = 0x00\n" + "> \t\t\t && (reg_config1 & 0x3f) == 0x00\n" "> \t\t\t && reg_convrate <= 0x07) {\n" "> \t\t\t\tkind = max6646;\n" "> -\t\t\t} else\n" "> -\t\t\t/* The MAX6648/6692 chips have a working man/chip id\n" "> -\t\t\t * and the same register set as the 6657.\n" "> -\t\t\t */\n" - "> -\t\t\tif (chip_id = 0x59 && address = 0x4C)\n" - "> +\t\t\t} else if (chip_id = 0x59 && address = 0x4C) {\n" + "> -\t\t\tif (chip_id == 0x59 && address == 0x4C)\n" + "> +\t\t\t} else if (chip_id == 0x59 && address == 0x4C) {\n" "> +\t\t\t\t/*\n" "> +\t\t\t\t * The MAX6648/6692 chips have a working\n" "> +\t\t\t\t * man/chip id and the same register set as the\n" @@ -63,11 +63,6 @@ "I thus nack this change of yours.\n" "\n" "-- \n" - "Jean Delvare\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + Jean Delvare -6babee0e0b6ae41b959ffcf91e2678bf5fe5dc56fb8e1805a3e5503b20a051cf +c68f96b392fac181381c2bfde92590b516318ab6adecf123c917eb864137f3fd
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.