diff for duplicates of <1079391394926@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 1bc61bf..79ca7f4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,7 +43,7 @@ diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c +++ b/drivers/i2c/chips/adm1021.c Mon Mar 15 14:34:04 2004 @@ -297,10 +297,6 @@ type_name = "gl523sm"; - } else if (kind = mc1066) { + } else if (kind == mc1066) { type_name = "mc1066"; - } else { - dev_err(&adapter->dev, "Internal error: unknown kind (%d)?!?", @@ -66,9 +66,9 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c /* Update battery voltage after every reading if true */ @@ -600,12 +600,6 @@ - if (kind = it87) { + if (kind == it87) { name = "it87"; -- } /* else if (kind = it8712) { +- } /* else if (kind == it8712) { - name = "it8712"; - } */ else { - dev_dbg(&adapter->dev, "Internal error: unknown kind (%d)?!?", @@ -81,7 +81,7 @@ diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c } /* The 8705 does not have VID capability */ -- /*if (data->type = it8712) { +- /*if (data->type == it8712) { - data->vid = it87_read_value(client, IT87_REG_VID); - data->vid &= 0x1f; - } @@ -106,7 +106,7 @@ diff -Nru a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c at this moment; i2c_detect really won't call us. */ @@ -170,10 +170,6 @@ - if (kind = lm75) { + if (kind == lm75) { name = "lm75"; - } else { - dev_dbg(&adapter->dev, "Internal error: unknown kind (%d)?!?", @@ -120,7 +120,7 @@ diff -Nru a/drivers/i2c/chips/lm78.c b/drivers/i2c/chips/lm78.c +++ b/drivers/i2c/chips/lm78.c Mon Mar 15 14:34:04 2004 @@ -609,11 +609,6 @@ client_name = "lm78-j"; - } else if (kind = lm79) { + } else if (kind == lm79) { client_name = "lm79"; - } else { - dev_dbg(&adapter->dev, "Internal error: unknown kind (%d)?!?", @@ -135,7 +135,7 @@ diff -Nru a/drivers/i2c/chips/lm85.c b/drivers/i2c/chips/lm85.c +++ b/drivers/i2c/chips/lm85.c Mon Mar 15 14:34:04 2004 @@ -815,10 +815,6 @@ type_name = "adm1027"; - } else if ( kind = adt7463 ) { + } else if ( kind == adt7463 ) { type_name = "adt7463"; - } else { - dev_dbg(&adapter->dev, "Internal error, invalid kind (%d)!", kind); @@ -149,7 +149,7 @@ diff -Nru a/drivers/i2c/chips/w83627hf.c b/drivers/i2c/chips/w83627hf.c +++ b/drivers/i2c/chips/w83627hf.c Mon Mar 15 14:34:04 2004 @@ -923,6 +923,11 @@ kind = w83627thf; - else if(val = W637_DEVID) + else if(val == W637_DEVID) kind = w83637hf; + else { + dev_info(&adapter->dev, @@ -158,10 +158,10 @@ diff -Nru a/drivers/i2c/chips/w83627hf.c b/drivers/i2c/chips/w83627hf.c + } superio_select(W83627HF_LD_HWM); - if((val = 0x01 & superio_inb(WINB_ACT_REG)) = 0) + if((val = 0x01 & superio_inb(WINB_ACT_REG)) == 0) @@ -960,11 +965,6 @@ client_name = "w83697hf"; - } else if (kind = w83637hf) { + } else if (kind == w83637hf) { client_name = "w83637hf"; - } else { - dev_err(&new_client->dev, "Internal error: unknown " @@ -185,7 +185,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c data->lm75[0] = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); @@ -1032,8 +1032,6 @@ client_name = "w83627hf subclient"; - else if (kind = as99127f) + else if (kind == as99127f) client_name = "as99127f subclient"; - else - client_name = "unknown subclient?"; @@ -198,14 +198,14 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c + /* Prevent users from forcing a kind for a bus it isn't supposed + to possibly be on */ -+ if (is_isa && (kind = as99127f || kind = w83783s)) { ++ if (is_isa && (kind == as99127f || kind == w83783s)) { + dev_err(&adapter->dev, + "Cannot force I2C-only chip for ISA address 0x%02x.\n", + address); + err = -EINVAL; + goto ERROR0; + } -+ if (!is_isa && kind = w83697hf) { ++ if (!is_isa && kind == w83697hf) { + dev_err(&adapter->dev, + "Cannot force ISA-only chip for I2C address 0x%02x.\n", + address); @@ -218,7 +218,7 @@ diff -Nru a/drivers/i2c/chips/w83781d.c b/drivers/i2c/chips/w83781d.c err = -EBUSY; @@ -1240,11 +1255,6 @@ client_name = "as99127f"; - } else if (kind = w83697hf) { + } else if (kind == w83697hf) { client_name = "w83697hf"; - } else { - dev_err(&new_client->dev, "Internal error: unknown " diff --git a/a/content_digest b/N1/content_digest index dfb8d1e..ea2bde8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\0107939139416@kroah.com\0" - "ref\010793913903814@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.4\0" - "Date\0Thu, 19 May 2005 06:24:48 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.4\0" + "Date\0Mon, 15 Mar 2004 14:56:34 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -52,7 +51,7 @@ "+++ b/drivers/i2c/chips/adm1021.c\tMon Mar 15 14:34:04 2004\n" "@@ -297,10 +297,6 @@\n" " \t\ttype_name = \"gl523sm\";\n" - " \t} else if (kind = mc1066) {\n" + " \t} else if (kind == mc1066) {\n" " \t\ttype_name = \"mc1066\";\n" "-\t} else {\n" "-\t\tdev_err(&adapter->dev, \"Internal error: unknown kind (%d)?!?\",\n" @@ -75,9 +74,9 @@ " /* Update battery voltage after every reading if true */\n" "@@ -600,12 +600,6 @@\n" " \n" - " \tif (kind = it87) {\n" + " \tif (kind == it87) {\n" " \t\tname = \"it87\";\n" - "-\t} /* else if (kind = it8712) {\n" + "-\t} /* else if (kind == it8712) {\n" "-\t\tname = \"it8712\";\n" "-\t} */ else {\n" "-\t\tdev_dbg(&adapter->dev, \"Internal error: unknown kind (%d)?!?\",\n" @@ -90,7 +89,7 @@ " \t\t}\n" " \n" " \t\t/* The 8705 does not have VID capability */\n" - "-\t\t/*if (data->type = it8712) {\n" + "-\t\t/*if (data->type == it8712) {\n" "-\t\t\tdata->vid = it87_read_value(client, IT87_REG_VID);\n" "-\t\t\tdata->vid &= 0x1f;\n" "-\t\t}\n" @@ -115,7 +114,7 @@ " \t at this moment; i2c_detect really won't call us. */\n" "@@ -170,10 +170,6 @@\n" " \n" - " \tif (kind = lm75) {\n" + " \tif (kind == lm75) {\n" " \t\tname = \"lm75\";\n" "-\t} else {\n" "-\t\tdev_dbg(&adapter->dev, \"Internal error: unknown kind (%d)?!?\",\n" @@ -129,7 +128,7 @@ "+++ b/drivers/i2c/chips/lm78.c\tMon Mar 15 14:34:04 2004\n" "@@ -609,11 +609,6 @@\n" " \t\tclient_name = \"lm78-j\";\n" - " \t} else if (kind = lm79) {\n" + " \t} else if (kind == lm79) {\n" " \t\tclient_name = \"lm79\";\n" "-\t} else {\n" "-\t\tdev_dbg(&adapter->dev, \"Internal error: unknown kind (%d)?!?\",\n" @@ -144,7 +143,7 @@ "+++ b/drivers/i2c/chips/lm85.c\tMon Mar 15 14:34:04 2004\n" "@@ -815,10 +815,6 @@\n" " \t\ttype_name = \"adm1027\";\n" - " \t} else if ( kind = adt7463 ) {\n" + " \t} else if ( kind == adt7463 ) {\n" " \t\ttype_name = \"adt7463\";\n" "-\t} else {\n" "-\t\tdev_dbg(&adapter->dev, \"Internal error, invalid kind (%d)!\", kind);\n" @@ -158,7 +157,7 @@ "+++ b/drivers/i2c/chips/w83627hf.c\tMon Mar 15 14:34:04 2004\n" "@@ -923,6 +923,11 @@\n" " \t\tkind = w83627thf;\n" - " \telse if(val = W637_DEVID)\n" + " \telse if(val == W637_DEVID)\n" " \t\tkind = w83637hf;\n" "+\telse {\n" "+\t\tdev_info(&adapter->dev,\n" @@ -167,10 +166,10 @@ "+\t}\n" " \n" " \tsuperio_select(W83627HF_LD_HWM);\n" - " \tif((val = 0x01 & superio_inb(WINB_ACT_REG)) = 0)\n" + " \tif((val = 0x01 & superio_inb(WINB_ACT_REG)) == 0)\n" "@@ -960,11 +965,6 @@\n" " \t\tclient_name = \"w83697hf\";\n" - " \t} else if (kind = w83637hf) {\n" + " \t} else if (kind == w83637hf) {\n" " \t\tclient_name = \"w83637hf\";\n" "-\t} else {\n" "-\t\tdev_err(&new_client->dev, \"Internal error: unknown \"\n" @@ -194,7 +193,7 @@ " \tdata->lm75[0] = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);\n" "@@ -1032,8 +1032,6 @@\n" " \t\tclient_name = \"w83627hf subclient\";\n" - " \telse if (kind = as99127f)\n" + " \telse if (kind == as99127f)\n" " \t\tclient_name = \"as99127f subclient\";\n" "-\telse\n" "-\t\tclient_name = \"unknown subclient?\";\n" @@ -207,14 +206,14 @@ " \n" "+\t/* Prevent users from forcing a kind for a bus it isn't supposed\n" "+\t to possibly be on */\n" - "+\tif (is_isa && (kind = as99127f || kind = w83783s)) {\n" + "+\tif (is_isa && (kind == as99127f || kind == w83783s)) {\n" "+\t\tdev_err(&adapter->dev,\n" "+\t\t\t\"Cannot force I2C-only chip for ISA address 0x%02x.\\n\",\n" "+\t\t\taddress);\n" "+\t\terr = -EINVAL;\n" "+\t\tgoto ERROR0;\n" "+\t}\n" - "+\tif (!is_isa && kind = w83697hf) {\n" + "+\tif (!is_isa && kind == w83697hf) {\n" "+\t\tdev_err(&adapter->dev,\n" "+\t\t\t\"Cannot force ISA-only chip for I2C address 0x%02x.\\n\",\n" "+\t\t\taddress);\n" @@ -227,7 +226,7 @@ " \t\t\terr = -EBUSY;\n" "@@ -1240,11 +1255,6 @@\n" " \t\tclient_name = \"as99127f\";\n" - " \t} else if (kind = w83697hf) {\n" + " \t} else if (kind == w83697hf) {\n" " \t\tclient_name = \"w83697hf\";\n" "-\t} else {\n" "-\t\tdev_err(&new_client->dev, \"Internal error: unknown \"\n" @@ -238,4 +237,4 @@ " \n" " \t/* Fill in the remaining client fields and put into the global list */" -5ccd6d32ea76647e21e15418fffc70b51e51554b434e6410e6e9979e971dc4f3 +2b5dc6c8d1c00b8bebcb4a3b098b720704ae9bc613cdcbc2799744b7a699ea65
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.