diff for duplicates of <1198796281.4833.31.camel@localhost> diff --git a/a/1.txt b/N1/1.txt index b4985d4..f36a011 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -47,7 +47,7 @@ Signed-off-by: Joe Perches <joe@perches.com> unsigned long timeout; /* Wait to get busy first */ timeout = jiffies + HZ * 60; -- while (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) = 0) && (time_before(jiffies, timeout))) +- while (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) == 0) && (time_before(jiffies, timeout))) + while (!gdrom_is_busy() && (time_before(jiffies, timeout))) cpu_relax(); /* Now wait for busy to clear */ @@ -56,9 +56,9 @@ Signed-off-by: Joe Perches <joe@perches.com> gd.pending = 1; gdrom_packetcommand(gd.cd_info, spin_command); /* 60 second timeout */ -- wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +- wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); + wait_event_interruptible_timeout(command_queue, -+ gd.pending = 0, HZ * 60); ++ gd.pending == 0, HZ * 60); gd.pending = 0; kfree(spin_command); if (gd.status & 0x01) { @@ -66,9 +66,9 @@ Signed-off-by: Joe Perches <joe@perches.com> toc_command->buflen = tocsize; gd.pending = 1; gdrom_packetcommand(gd.cd_info, toc_command); -- wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +- wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); + wait_event_interruptible_timeout(command_queue, -+ gd.pending = 0, HZ * 60); ++ gd.pending == 0, HZ * 60); gd.pending = 0; insw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2); kfree(toc_command); @@ -119,9 +119,9 @@ Signed-off-by: Joe Perches <joe@perches.com> gd.pending = 1; gdrom_packetcommand(gd.cd_info, sense_command); /* 60 second timeout */ -- wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +- wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); + wait_event_interruptible_timeout(command_queue, -+ gd.pending = 0, HZ * 60); ++ gd.pending == 0, HZ * 60); gd.pending = 0; kfree(sense_command); insw(PHYSADDR(GDROM_DATA_REG), &sense, 5); @@ -184,9 +184,9 @@ Signed-off-by: Joe Perches <joe@perches.com> cpu_relax(); ctrl_outb(1, GDROM_DMA_STATUS_REG); /* 5 second error margin here seems more reasonable */ -- wait_event_interruptible_timeout(request_queue, gd.transfer = 0, HZ * 5); +- wait_event_interruptible_timeout(request_queue, gd.transfer == 0, HZ * 5); + wait_event_interruptible_timeout(request_queue, -+ gd.transfer = 0, HZ * 5); ++ gd.transfer == 0, HZ * 5); err = ctrl_inb(GDROM_DMA_STATUS_REG); err = gd.transfer; gd.transfer = 0; diff --git a/a/content_digest b/N1/content_digest index b78e767..176eeb2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01198774339.6170.11.camel@localhost.localdomain\0" "From\0Joe Perches <joe@perches.com>\0" "Subject\0Re: [PATCH] SH/Dreamcast - add support for GD-Rom device\0" - "Date\0Thu, 27 Dec 2007 22:58:01 +0000\0" + "Date\0Thu, 27 Dec 2007 14:58:01 -0800\0" "To\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" "Cc\0Paul Mundt <lethal@linux-sh.org>" Jens Axboe <jens.axboe@oracle.com> @@ -58,7 +58,7 @@ " \tunsigned long timeout;\n" " \t/* Wait to get busy first */\n" " \ttimeout = jiffies + HZ * 60;\n" - "-\twhile (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) = 0) && (time_before(jiffies, timeout)))\n" + "-\twhile (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) == 0) && (time_before(jiffies, timeout)))\n" "+\twhile (!gdrom_is_busy() && (time_before(jiffies, timeout)))\n" " \t\tcpu_relax();\n" " \t/* Now wait for busy to clear */\n" @@ -67,9 +67,9 @@ " \tgd.pending = 1;\n" " \tgdrom_packetcommand(gd.cd_info, spin_command);\n" " \t/* 60 second timeout */\n" - "-\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "-\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "+\twait_event_interruptible_timeout(command_queue,\n" - "+\t\t\t\t\t gd.pending = 0, HZ * 60);\n" + "+\t\t\t\t\t gd.pending == 0, HZ * 60);\n" " \tgd.pending = 0;\n" " \tkfree(spin_command);\n" " \tif (gd.status & 0x01) {\n" @@ -77,9 +77,9 @@ " \ttoc_command->buflen = tocsize;\n" " \tgd.pending = 1;\n" " \tgdrom_packetcommand(gd.cd_info, toc_command);\n" - "-\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "-\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "+\twait_event_interruptible_timeout(command_queue,\n" - "+\t\t\t\t\t gd.pending = 0, HZ * 60);\n" + "+\t\t\t\t\t gd.pending == 0, HZ * 60);\n" " \tgd.pending = 0;\n" " \tinsw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2);\n" " \tkfree(toc_command);\n" @@ -130,9 +130,9 @@ " \tgd.pending = 1;\n" " \tgdrom_packetcommand(gd.cd_info, sense_command);\n" " \t/* 60 second timeout */\n" - "-\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "-\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "+\twait_event_interruptible_timeout(command_queue,\n" - "+\t\t\t\t\t gd.pending = 0, HZ * 60);\n" + "+\t\t\t\t\t gd.pending == 0, HZ * 60);\n" " \tgd.pending = 0;\n" " \tkfree(sense_command);\n" " \tinsw(PHYSADDR(GDROM_DATA_REG), &sense, 5);\n" @@ -195,9 +195,9 @@ " \t\t\tcpu_relax();\n" " \t\tctrl_outb(1, GDROM_DMA_STATUS_REG);\n" " \t\t/* 5 second error margin here seems more reasonable */\n" - "-\t\twait_event_interruptible_timeout(request_queue, gd.transfer = 0, HZ * 5);\n" + "-\t\twait_event_interruptible_timeout(request_queue, gd.transfer == 0, HZ * 5);\n" "+\t\twait_event_interruptible_timeout(request_queue,\n" - "+\t\t\t\t\t\t gd.transfer = 0, HZ * 5);\n" + "+\t\t\t\t\t\t gd.transfer == 0, HZ * 5);\n" " \t\terr = ctrl_inb(GDROM_DMA_STATUS_REG);\n" " \t\terr = gd.transfer;\n" " \t\tgd.transfer = 0;\n" @@ -276,4 +276,4 @@ " \treturn err;\n" } -4204bb4399cd34481720469797e179c9d424cb7918cb87e7e3d15776271113a7 +750936b4d27ed1c733946957d8b22e3b6fc22861770b92610d7d88457ced76c1
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.