diff for duplicates of <20050407111631.GA21190@orphique> diff --git a/a/1.txt b/N1/1.txt index 631a500..e216121 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,7 +38,8 @@ accept support for DS1339. Best regards, ladis -=== drivers/i2c/chips/ds1337.c 1.1 vs edited ==--- 1.1/drivers/i2c/chips/ds1337.c 2005-03-31 22:58:08 +02:00 +===== drivers/i2c/chips/ds1337.c 1.1 vs edited ===== +--- 1.1/drivers/i2c/chips/ds1337.c 2005-03-31 22:58:08 +02:00 +++ edited/drivers/i2c/chips/ds1337.c 2005-04-07 13:02:18 +02:00 @@ -2,8 +2,9 @@ * linux/drivers/i2c/chips/ds1337.c @@ -284,20 +285,20 @@ Best regards, /* Check for a valid day register value */ - if ((ds1337_read(new_client, DS1337_REG_DAY, &data) < 0) || + if ((ds1337_read(client, DS1337_REG_DAY, &data) < 0) || - (data = 0) || (data & 0xf8)) + (data == 0) || (data & 0xf8)) goto exit_free; /* Check for a valid date register value */ - if ((ds1337_read(new_client, DS1337_REG_DATE, &data) < 0) || + if ((ds1337_read(client, DS1337_REG_DATE, &data) < 0) || - (data = 0) || (data & 0xc0) || ((data & 0x0f) > 9) || + (data == 0) || (data & 0xc0) || ((data & 0x0f) > 9) || (data >= 0x32)) goto exit_free; /* Check for a valid month register value */ - if ((ds1337_read(new_client, DS1337_REG_MONTH, &data) < 0) || + if ((ds1337_read(client, DS1337_REG_MONTH, &data) < 0) || - (data = 0) || (data & 0x60) || ((data & 0x0f) > 9) || + (data == 0) || (data & 0x60) || ((data & 0x0f) > 9) || ((data >= 0x13) && (data <= 0x19))) goto exit_free; @@ -310,7 +311,7 @@ Best regards, kind = ds1337; } -- if (kind = ds1337) +- if (kind == ds1337) + switch (kind) { + case ds1337: name = "ds1337"; diff --git a/a/content_digest b/N1/content_digest index 0b0136d..8af333f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020050407094506.GA19360@orphique\0" "ref\08iOUo9nl.1112867945.5643950.khali@localhost\0" - "From\0ladis@linux-mips.org (Ladislav Michl)\0" - "Subject\0[PATCH] i2c: new driver for ds1337 RTC\0" - "Date\0Thu, 19 May 2005 06:25:49 +0000\0" + "From\0Ladislav Michl <ladis@linux-mips.org>\0" + "Subject\0Re: [PATCH] i2c: new driver for ds1337 RTC\0" + "Date\0Thu, 7 Apr 2005 13:16:31 +0200\0" "To\0Jean Delvare <khali@linux-fr.org>\0" "Cc\0greg@kroah.com" LKML <linux-kernel@vger.kernel.org> @@ -50,7 +50,8 @@ "Best regards,\n" "\tladis\n" "\n" - "=== drivers/i2c/chips/ds1337.c 1.1 vs edited ==--- 1.1/drivers/i2c/chips/ds1337.c\t2005-03-31 22:58:08 +02:00\n" + "===== drivers/i2c/chips/ds1337.c 1.1 vs edited =====\n" + "--- 1.1/drivers/i2c/chips/ds1337.c\t2005-03-31 22:58:08 +02:00\n" "+++ edited/drivers/i2c/chips/ds1337.c\t2005-04-07 13:02:18 +02:00\n" "@@ -2,8 +2,9 @@\n" " * linux/drivers/i2c/chips/ds1337.c\n" @@ -296,20 +297,20 @@ " \t\t/* Check for a valid day register value */\n" "-\t\tif ((ds1337_read(new_client, DS1337_REG_DAY, &data) < 0) ||\n" "+\t\tif ((ds1337_read(client, DS1337_REG_DAY, &data) < 0) ||\n" - " \t\t (data = 0) || (data & 0xf8))\n" + " \t\t (data == 0) || (data & 0xf8))\n" " \t\t\tgoto exit_free;\n" " \n" " \t\t/* Check for a valid date register value */\n" "-\t\tif ((ds1337_read(new_client, DS1337_REG_DATE, &data) < 0) ||\n" "+\t\tif ((ds1337_read(client, DS1337_REG_DATE, &data) < 0) ||\n" - " \t\t (data = 0) || (data & 0xc0) || ((data & 0x0f) > 9) ||\n" + " \t\t (data == 0) || (data & 0xc0) || ((data & 0x0f) > 9) ||\n" " \t\t (data >= 0x32))\n" " \t\t\tgoto exit_free;\n" " \n" " \t\t/* Check for a valid month register value */\n" "-\t\tif ((ds1337_read(new_client, DS1337_REG_MONTH, &data) < 0) ||\n" "+\t\tif ((ds1337_read(client, DS1337_REG_MONTH, &data) < 0) ||\n" - " \t\t (data = 0) || (data & 0x60) || ((data & 0x0f) > 9) ||\n" + " \t\t (data == 0) || (data & 0x60) || ((data & 0x0f) > 9) ||\n" " \t\t ((data >= 0x13) && (data <= 0x19)))\n" " \t\t\tgoto exit_free;\n" " \n" @@ -322,7 +323,7 @@ " \t\tkind = ds1337;\n" " \t}\n" " \n" - "-\tif (kind = ds1337)\n" + "-\tif (kind == ds1337)\n" "+\tswitch (kind) {\n" "+\tcase ds1337:\n" " \t\tname = \"ds1337\";\n" @@ -347,4 +348,4 @@ " \t/* Add client to local list */\n" " \tdata->id = ds1337_id++;" -3a3e90839764538be3468eecd1cbc4086bc3b7fb0379fb9d5b07222a88cce6c7 +e27a5d7765110ee9a8d6268a16682efd48d03f419af59d2189a44e250b766c46
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.