diff for duplicates of <200504210208.44541.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index 456372a..077d4e3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,15 +9,16 @@ Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 2 files changed, 10 insertions(+), 15 deletions(-) Index: dtor/drivers/w1/w1.c -=================================--- dtor.orig/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c +++ dtor/drivers/w1/w1.c @@ -513,8 +513,7 @@ void w1_slave_found(unsigned long data, - sl->reg_num.crc = tmp->crc) { + 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) { +- else if (sl->reg_num.family == tmp->family) { ++ } else if (sl->reg_num.family == tmp->family) { family_found = 1; break; } @@ -25,13 +26,13 @@ Index: dtor/drivers/w1/w1.c slave_count++; } -- if (slave_count = dev->slave_count && rn ) { +- if (slave_count == dev->slave_count && rn ) { - tmp = cpu_to_le64(rn); -- if(((rn >> 56) & 0xff) = w1_calc_crc8((u8 *)&tmp, 7)) +- if(((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7)) - w1_attach_slave_device(dev, (struct w1_reg_num *) &rn); -+ if (slave_count = dev->slave_count && rn) { ++ if (slave_count == dev->slave_count && rn) { + tmp = cpu_to_le64(rn); -+ if (((rn >> 56) & 0xff) = w1_calc_crc8((u8 *)&tmp, 7)) ++ if (((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7)) + w1_attach_slave_device(dev, (struct w1_reg_num *) &rn); } @@ -68,7 +69,8 @@ Index: dtor/drivers/w1/w1.c } up(&dev->mutex); Index: dtor/drivers/w1/dscore.c -=================================--- dtor.orig/drivers/w1/dscore.c +=================================================================== +--- dtor.orig/drivers/w1/dscore.c +++ dtor/drivers/w1/dscore.c @@ -319,10 +319,8 @@ int ds_wait_status(struct ds_device *dev if (((err > 16) && (buf[0x10] & 0x01)) || count >= 100 || err < 0) { diff --git a/a/content_digest b/N1/content_digest index b11e3f3..2cff9f8 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 2/22] W1: formatting fixes\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "Date\0Thu, 21 Apr 2005 02:08:43 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> @@ -19,15 +19,16 @@ " 2 files changed, 10 insertions(+), 15 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" "@@ -513,8 +513,7 @@ void w1_slave_found(unsigned long data, \n" - " \t\t sl->reg_num.crc = tmp->crc) {\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}\n" - "-\t\telse if (sl->reg_num.family = tmp->family) {\n" - "+\t\t} else if (sl->reg_num.family = tmp->family) {\n" + "-\t\telse 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\t\tbreak;\n" " \t\t}\n" @@ -35,13 +36,13 @@ " \t\tslave_count++;\n" " \t}\n" " \n" - "-\t\tif (slave_count = dev->slave_count && rn ) {\n" + "-\t\tif (slave_count == dev->slave_count && rn ) {\n" "-\t\t\ttmp = cpu_to_le64(rn);\n" - "-\t\t\tif(((rn >> 56) & 0xff) = w1_calc_crc8((u8 *)&tmp, 7))\n" + "-\t\t\tif(((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7))\n" "-\t\t\t\tw1_attach_slave_device(dev, (struct w1_reg_num *) &rn);\n" - "+\tif (slave_count = dev->slave_count && rn) {\n" + "+\tif (slave_count == dev->slave_count && rn) {\n" "+\t\ttmp = cpu_to_le64(rn);\n" - "+\t\tif (((rn >> 56) & 0xff) = w1_calc_crc8((u8 *)&tmp, 7))\n" + "+\t\tif (((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&tmp, 7))\n" "+\t\t\tw1_attach_slave_device(dev, (struct w1_reg_num *) &rn);\n" " \t}\n" " \n" @@ -78,7 +79,8 @@ " \t\t}\n" " \t\tup(&dev->mutex);\n" "Index: dtor/drivers/w1/dscore.c\n" - "=================================--- dtor.orig/drivers/w1/dscore.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/dscore.c\n" "+++ dtor/drivers/w1/dscore.c\n" "@@ -319,10 +319,8 @@ int ds_wait_status(struct ds_device *dev\n" " \tif (((err > 16) && (buf[0x10] & 0x01)) || count >= 100 || err < 0) {\n" @@ -93,4 +95,4 @@ " \n" int ds_reset(struct ds_device *dev, struct ds_status *st) -d3d545351230d04653a1a20f1ef64a5197d06a253640ac1644544a23142243c5 +2c218709fe0aa5cb8e463bdcefc56bed4bad4aa77a3bdde07962bf5bdb40ce07
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.