diff for duplicates of <10745567611005@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 11847c9..3636fed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -129,7 +129,7 @@ diff -Nru a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parp + Copyright (C) 1995-2000 Simon G. Vogl + With some changes from: + Frodo Looijaard <frodol@dds.nl> -+ Ky?sti M?lkki <kmalkki@cc.hut.fi> ++ Kyösti Mälkki <kmalkki@cc.hut.fi> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by @@ -191,7 +191,7 @@ diff -Nru a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parp + u8 oldval = port_read(op->port); + + return ((op->inverted && (oldval & op->val) != op->val) -+ || (!op->inverted && (oldval & op->val) = op->val)); ++ || (!op->inverted && (oldval & op->val) == op->val)); +} + +/* ----- I2C algorithm call-back functions and structures ----------------- */ @@ -251,7 +251,7 @@ diff -Nru a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parp + type = 0; + } + -+ if (base = 0) { ++ if (base == 0) { + printk(KERN_INFO "i2c-parport: using default base 0x%x\n", DEFAULT_BASE); + base = DEFAULT_BASE; + } @@ -307,7 +307,7 @@ diff -Nru a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c + Copyright (C) 1995-2000 Simon G. Vogl + With some changes from: + Frodo Looijaard <frodol@dds.nl> -+ Ky?sti M?lkki <kmalkki@cc.hut.fi> ++ Kyösti Mälkki <kmalkki@cc.hut.fi> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by @@ -402,7 +402,7 @@ diff -Nru a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c + u8 oldval = port_read[op->port](data); + + return ((op->inverted && (oldval & op->val) != op->val) -+ || (!op->inverted && (oldval & op->val) = op->val)); ++ || (!op->inverted && (oldval & op->val) == op->val)); +} + +/* ----- I2C algorithm call-back functions and structures ----------------- */ @@ -456,7 +456,7 @@ diff -Nru a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c + struct i2c_par *adapter; + + adapter = kmalloc(sizeof(struct i2c_par), GFP_KERNEL); -+ if (adapter = NULL) { ++ if (adapter == NULL) { + printk(KERN_ERR "i2c-parport: Failed to kmalloc\n"); + return; + } @@ -515,7 +515,7 @@ diff -Nru a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c + /* Walk the list */ + for (prev = NULL, adapter = adapter_list; adapter; + prev = adapter, adapter = adapter->next) { -+ if (adapter->pdev->port = port) { ++ if (adapter->pdev->port == port) { + /* Un-init if needed (power off...) */ + if (adapter_parm[type].init.val) + line_set(port, 0, &adapter_parm[type].init); diff --git a/a/content_digest b/N1/content_digest index 5a1b6e9..c16e701 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010745567611379@kroah.com\0" - "ref\01074556757661@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.1\0" - "Date\0Thu, 19 May 2005 06:24:36 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.1\0" + "Date\0Mon, 19 Jan 2004 15:59:21 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -138,7 +137,7 @@ "+ Copyright (C) 1995-2000 Simon G. Vogl\n" "+ With some changes from:\n" "+ Frodo Looijaard <frodol@dds.nl>\n" - "+ Ky?sti M?lkki <kmalkki@cc.hut.fi>\n" + "+ Ky\303\266sti M\303\244lkki <kmalkki@cc.hut.fi>\n" "+ \n" "+ This program is free software; you can redistribute it and/or modify\n" "+ it under the terms of the GNU General Public License as published by\n" @@ -200,7 +199,7 @@ "+\tu8 oldval = port_read(op->port);\n" "+\n" "+\treturn ((op->inverted && (oldval & op->val) != op->val)\n" - "+\t || (!op->inverted && (oldval & op->val) = op->val));\n" + "+\t || (!op->inverted && (oldval & op->val) == op->val));\n" "+}\n" "+\n" "+/* ----- I2C algorithm call-back functions and structures ----------------- */\n" @@ -260,7 +259,7 @@ "+\t\ttype = 0;\n" "+\t}\n" "+\t\n" - "+\tif (base = 0) {\n" + "+\tif (base == 0) {\n" "+\t\tprintk(KERN_INFO \"i2c-parport: using default base 0x%x\\n\", DEFAULT_BASE);\n" "+\t\tbase = DEFAULT_BASE;\n" "+\t}\n" @@ -316,7 +315,7 @@ "+ Copyright (C) 1995-2000 Simon G. Vogl\n" "+ With some changes from:\n" "+ Frodo Looijaard <frodol@dds.nl>\n" - "+ Ky?sti M?lkki <kmalkki@cc.hut.fi>\n" + "+ Ky\303\266sti M\303\244lkki <kmalkki@cc.hut.fi>\n" "+ \n" "+ This program is free software; you can redistribute it and/or modify\n" "+ it under the terms of the GNU General Public License as published by\n" @@ -411,7 +410,7 @@ "+\tu8 oldval = port_read[op->port](data);\n" "+\n" "+\treturn ((op->inverted && (oldval & op->val) != op->val)\n" - "+\t || (!op->inverted && (oldval & op->val) = op->val));\n" + "+\t || (!op->inverted && (oldval & op->val) == op->val));\n" "+}\n" "+\n" "+/* ----- I2C algorithm call-back functions and structures ----------------- */\n" @@ -465,7 +464,7 @@ "+\tstruct i2c_par *adapter;\n" "+\t\n" "+\tadapter = kmalloc(sizeof(struct i2c_par), GFP_KERNEL);\n" - "+\tif (adapter = NULL) {\n" + "+\tif (adapter == NULL) {\n" "+\t\tprintk(KERN_ERR \"i2c-parport: Failed to kmalloc\\n\");\n" "+\t\treturn;\n" "+\t}\n" @@ -524,7 +523,7 @@ "+\t/* Walk the list */\n" "+\tfor (prev = NULL, adapter = adapter_list; adapter;\n" "+\t prev = adapter, adapter = adapter->next) {\n" - "+\t\tif (adapter->pdev->port = port) {\n" + "+\t\tif (adapter->pdev->port == port) {\n" "+\t\t\t/* Un-init if needed (power off...) */\n" "+\t\t\tif (adapter_parm[type].init.val)\n" "+\t\t\t\tline_set(port, 0, &adapter_parm[type].init);\n" @@ -665,4 +664,4 @@ "+\t\" 3 = ELV adapter\\n\"\n" "+\t\" 4 = ADM 1032 evalulation board\\n\");" -fff518898525d1c44290e18818b08503a73f024d7285cf01cc57530b61574efb +041406a41d0389b06fe3afdb8b80dd1457d48b635de3aed4f8fb23cdef871575
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.