diff for duplicates of <200504210211.53134.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index 7acb86a..330208b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 3 files changed, 58 insertions(+), 102 deletions(-) Index: dtor/drivers/w1/w1.c -=================================--- dtor.orig/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c +++ dtor/drivers/w1/w1.c @@ -184,6 +184,7 @@ static ssize_t w1_master_attribute_show_ @@ -24,7 +25,7 @@ Index: dtor/drivers/w1/w1.c if (down_interruptible(&md->mutex)) @@ -191,16 +192,9 @@ static ssize_t w1_master_attribute_show_ - if (md->slave_count = 0) + if (md->slave_count == 0) c -= snprintf(buf + PAGE_SIZE - c, c, "not found.\n"); - else { - struct list_head *ent, *n; @@ -70,9 +71,9 @@ Index: dtor/drivers/w1/w1.c spin_lock_irq(&w1_mlock); - list_for_each_entry(dev, &w1_masters, w1_master_entry) { -- if (dev->bus_master->data = data) { +- if (dev->bus_master->data == data) { + list_for_each_entry(master, &w1_masters, node) { -+ if (master->bus_master->data = data) { ++ if (master->bus_master->data == data) { found = 1; - atomic_inc(&dev->refcnt); + atomic_inc(&master->refcnt); @@ -105,16 +106,16 @@ Index: dtor/drivers/w1/w1.c - sl = list_entry(ent, struct w1_slave, w1_slave_entry); - -- if (sl->reg_num.family = tmp->family && -- sl->reg_num.id = tmp->id && -- sl->reg_num.crc = tmp->crc) { +- if (sl->reg_num.family == tmp->family && +- sl->reg_num.id == tmp->id && +- sl->reg_num.crc == tmp->crc) { - set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags); - break; -- } else if (sl->reg_num.family = tmp->family) { +- } else if (sl->reg_num.family == tmp->family) { - family_found = 1; -+ if (slave->reg_num.family = tmp->family && -+ slave->reg_num.id = tmp->id && -+ slave->reg_num.crc = tmp->crc) { ++ if (slave->reg_num.family == tmp->family && ++ slave->reg_num.id == tmp->id && ++ slave->reg_num.crc == tmp->crc) { + set_bit(W1_SLAVE_ACTIVE, &slave->flags); break; } @@ -268,7 +269,8 @@ Index: dtor/drivers/w1/w1.c control_needs_exit = 1; Index: dtor/drivers/w1/w1.h -=================================--- dtor.orig/drivers/w1/w1.h +=================================================================== +--- dtor.orig/drivers/w1/w1.h +++ dtor/drivers/w1/w1.h @@ -66,11 +66,11 @@ struct w1_slave { @@ -294,7 +296,8 @@ Index: dtor/drivers/w1/w1.h unsigned char name[W1_MAXNAMELEN]; struct list_head slist; Index: dtor/drivers/w1/w1_int.c -=================================--- dtor.orig/drivers/w1/w1_int.c +=================================================================== +--- dtor.orig/drivers/w1/w1_int.c +++ dtor/drivers/w1/w1_int.c @@ -142,7 +142,7 @@ int w1_add_master_device(struct w1_bus_m dev->initialized = 1; @@ -318,9 +321,9 @@ Index: dtor/drivers/w1/w1_int.c - if (!dev->initialized) - continue; - -- if (dev->bus_master->data = bm->data) +- if (dev->bus_master->data == bm->data) + list_for_each_entry(dev, &w1_masters, node) -+ if (dev->initialized && dev->bus_master->data = bm->data) { ++ if (dev->initialized && dev->bus_master->data == bm->data) { + __w1_remove_master_device(dev); break; - } diff --git a/a/content_digest b/N1/content_digest index 53101bd..f10c9d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0200504210207.02421.dtor_core@ameritech.net\0" - "From\0dtor_core@ameritech.net (Dmitry Torokhov)\0" + "From\0Dmitry Torokhov <dtor_core@ameritech.net>\0" "Subject\0[RFC/PATCH 5/22] W1: list handling cleanup\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "Date\0Thu, 21 Apr 2005 02:11:52 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> @@ -22,7 +22,8 @@ " 3 files changed, 58 insertions(+), 102 deletions(-)\n" "\n" "Index: dtor/drivers/w1/w1.c\n" - "=================================--- dtor.orig/drivers/w1/w1.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.c\n" "+++ dtor/drivers/w1/w1.c\n" "@@ -184,6 +184,7 @@ static ssize_t w1_master_attribute_show_\n" " \n" @@ -34,7 +35,7 @@ " \tif (down_interruptible(&md->mutex))\n" "@@ -191,16 +192,9 @@ static ssize_t w1_master_attribute_show_\n" " \n" - " \tif (md->slave_count = 0)\n" + " \tif (md->slave_count == 0)\n" " \t\tc -= snprintf(buf + PAGE_SIZE - c, c, \"not found.\\n\");\n" "-\telse {\n" "-\t\tstruct list_head *ent, *n;\n" @@ -80,9 +81,9 @@ " \n" " \tspin_lock_irq(&w1_mlock);\n" "-\tlist_for_each_entry(dev, &w1_masters, w1_master_entry) {\n" - "-\t\tif (dev->bus_master->data = data) {\n" + "-\t\tif (dev->bus_master->data == data) {\n" "+\tlist_for_each_entry(master, &w1_masters, node) {\n" - "+\t\tif (master->bus_master->data = data) {\n" + "+\t\tif (master->bus_master->data == data) {\n" " \t\t\tfound = 1;\n" "-\t\t\tatomic_inc(&dev->refcnt);\n" "+\t\t\tatomic_inc(&master->refcnt);\n" @@ -115,16 +116,16 @@ " \n" "-\t\tsl = list_entry(ent, struct w1_slave, w1_slave_entry);\n" "-\n" - "-\t\tif (sl->reg_num.family = tmp->family &&\n" - "-\t\t sl->reg_num.id = tmp->id &&\n" - "-\t\t sl->reg_num.crc = tmp->crc) {\n" + "-\t\tif (sl->reg_num.family == tmp->family &&\n" + "-\t\t sl->reg_num.id == tmp->id &&\n" + "-\t\t sl->reg_num.crc == tmp->crc) {\n" "-\t\t\tset_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);\n" "-\t\t\tbreak;\n" - "-\t\t} else if (sl->reg_num.family = tmp->family) {\n" + "-\t\t} else if (sl->reg_num.family == tmp->family) {\n" "-\t\t\tfamily_found = 1;\n" - "+\t\tif (slave->reg_num.family = tmp->family &&\n" - "+\t\t slave->reg_num.id = tmp->id &&\n" - "+\t\t slave->reg_num.crc = tmp->crc) {\n" + "+\t\tif (slave->reg_num.family == tmp->family &&\n" + "+\t\t slave->reg_num.id == tmp->id &&\n" + "+\t\t slave->reg_num.crc == tmp->crc) {\n" "+\t\t\tset_bit(W1_SLAVE_ACTIVE, &slave->flags);\n" " \t\t\tbreak;\n" " \t\t}\n" @@ -278,7 +279,8 @@ " \tcontrol_needs_exit = 1;\n" " \n" "Index: dtor/drivers/w1/w1.h\n" - "=================================--- dtor.orig/drivers/w1/w1.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.h\n" "+++ dtor/drivers/w1/w1.h\n" "@@ -66,11 +66,11 @@ struct w1_slave\n" " {\n" @@ -304,7 +306,8 @@ " \tunsigned char\t\tname[W1_MAXNAMELEN];\n" " \tstruct list_head\tslist;\n" "Index: dtor/drivers/w1/w1_int.c\n" - "=================================--- dtor.orig/drivers/w1/w1_int.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_int.c\n" "+++ dtor/drivers/w1/w1_int.c\n" "@@ -142,7 +142,7 @@ int w1_add_master_device(struct w1_bus_m\n" " \tdev->initialized = 1;\n" @@ -328,9 +331,9 @@ "-\t\tif (!dev->initialized)\n" "-\t\t\tcontinue;\n" "-\n" - "-\t\tif (dev->bus_master->data = bm->data)\n" + "-\t\tif (dev->bus_master->data == bm->data)\n" "+\tlist_for_each_entry(dev, &w1_masters, node)\n" - "+\t\tif (dev->initialized && dev->bus_master->data = bm->data) {\n" + "+\t\tif (dev->initialized && dev->bus_master->data == bm->data) {\n" "+\t\t\t__w1_remove_master_device(dev);\n" " \t\t\tbreak;\n" "-\t}\n" @@ -347,4 +350,4 @@ " \n" EXPORT_SYMBOL(w1_add_master_device); -b0b8c251aa673c998a12c0cf2c276ba64fb7a80ee73a6586c857457d62193aab +1bee5e00602d375f88f2802165c1e71f9b25f2e26ccdd2f3ed2e365b38463e4d
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.