diff for duplicates of <20050407094506.GA19360@orphique> diff --git a/a/1.txt b/N1/1.txt index 3c86936..73a1608 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,7 +40,8 @@ generic interface to I2C RTC drivers? (Shall I write one? ;-)) 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 11:28:06 +02:00 @@ -2,15 +2,16 @@ * linux/drivers/i2c/chips/ds1337.c @@ -148,7 +149,7 @@ Best regards, + dev_err(&client->dev, "error reading data! %d\n", result); + return 0; + } else -+ return (buf[0] = buf[16]) ? 0 : 1; ++ return (buf[0] == buf[16]) ? 0 : 1; +} - result = client->adapter->algo->master_xfer(client->adapter, @@ -345,20 +346,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; @@ -376,7 +377,7 @@ Best regards, + kind = ds1337; } -- if (kind = ds1337) +- if (kind == ds1337) + switch (kind) { + case ds1337: name = "ds1337"; @@ -406,7 +407,7 @@ Best regards, list_add(&data->list, &ds1337_clients); + + /* Be nice to battery */ -+ if (kind = ds1339 && ds1339_charge) { ++ if (kind == ds1339 && ds1339_charge) { + char buf[] = { DS1339_REG_CHARGE, ds1339_charge }; + + if (i2c_master_send(client, buf, sizeof(buf)) != sizeof(buf)) diff --git a/a/content_digest b/N1/content_digest index 87d45f4..543e74e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\011123113911463@kroah.com\0" "ref\011123113913563@kroah.com\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 11:45:06 +0200\0" "To\0Greg K-H <greg@kroah.com>\0" "Cc\0linux-kernel@vger.kernel.org" sensors@stimpy.netroedge.com @@ -51,7 +51,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 11:28:06 +02:00\n" "@@ -2,15 +2,16 @@\n" " * linux/drivers/i2c/chips/ds1337.c\n" @@ -159,7 +160,7 @@ "+\t\tdev_err(&client->dev, \"error reading data! %d\\n\", result);\n" "+\t\treturn 0;\n" "+\t} else\n" - "+\t\treturn (buf[0] = buf[16]) ? 0 : 1;\n" + "+\t\treturn (buf[0] == buf[16]) ? 0 : 1;\n" "+}\n" " \n" "-\tresult = client->adapter->algo->master_xfer(client->adapter,\n" @@ -356,20 +357,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" @@ -387,7 +388,7 @@ "+\t\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" @@ -417,7 +418,7 @@ " \tlist_add(&data->list, &ds1337_clients);\n" "+\n" "+\t/* Be nice to battery */\n" - "+\tif (kind = ds1339 && ds1339_charge) {\n" + "+\tif (kind == ds1339 && ds1339_charge) {\n" "+\t\tchar buf[] = { DS1339_REG_CHARGE, ds1339_charge };\n" "+\n" "+\t\tif (i2c_master_send(client, buf, sizeof(buf)) != sizeof(buf))\n" @@ -427,4 +428,4 @@ " \n" " \treturn 0;" -8907093c49f42951ed8df2be98ca6866a80581083dbf6ccc383d8a811dddde85 +44292792ebbec8daf8a7f1f8547f6d52b49de0e439860591a2b6e95d6e65cb4b
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.