diff for duplicates of <1200527877.6243.3.camel@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 0b7c83d..d29ad53 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -199,7 +199,7 @@ diff -rupN a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c + +static bool gdrom_data_request(void) +{ -+ return (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) = 8; ++ return (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) == 8; +} + +static bool gdrom_wait_clrbusy(void) @@ -308,7 +308,7 @@ diff -rupN a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c + gd.pending = 1; + gdrom_packetcommand(gd.cd_info, spin_command); + /* 60 second timeout */ -+ wait_event_interruptible_timeout(command_queue, gd.pending = 0, ++ wait_event_interruptible_timeout(command_queue, gd.pending == 0, + GDROM_DEFAULT_TIMEOUT); + gd.pending = 0; + kfree(spin_command); @@ -348,7 +348,7 @@ diff -rupN a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c + } + gd.pending = 1; + gdrom_packetcommand(gd.cd_info, toc_command); -+ wait_event_interruptible_timeout(command_queue, gd.pending = 0, ++ wait_event_interruptible_timeout(command_queue, gd.pending == 0, + GDROM_DEFAULT_TIMEOUT); + if (gd.pending) { + err = -EINVAL; @@ -441,9 +441,9 @@ diff -rupN a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c + /* read the sense key */ + char sense = ctrl_inb(GDROM_ERROR_REG); + sense &= 0xF0; -+ if (sense = 0) ++ if (sense == 0) + return CDS_DISC_OK; -+ if (sense = 0x20) ++ if (sense == 0x20) + return CDS_DRIVE_NOT_READY; + /* default */ + return CDS_NO_INFO; @@ -452,7 +452,7 @@ diff -rupN a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c +static int gdrom_mediachanged(struct cdrom_device_info *cd_info, int ignore) +{ + /* check the sense key */ -+ return (ctrl_inb(GDROM_ERROR_REG) & 0xF0) = 0x60; ++ return (ctrl_inb(GDROM_ERROR_REG) & 0xF0) == 0x60; +} + +/* reset the G1 bus */ @@ -501,7 +501,7 @@ diff -rupN a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c + } + gd.pending = 1; + gdrom_packetcommand(gd.cd_info, sense_command); -+ wait_event_interruptible_timeout(command_queue, gd.pending = 0, ++ wait_event_interruptible_timeout(command_queue, gd.pending == 0, + GDROM_DEFAULT_TIMEOUT); + if (gd.pending) + goto cleanup_sense; @@ -672,7 +672,7 @@ diff -rupN a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c + /* start transfer */ + ctrl_outb(1, GDROM_DMA_STATUS_REG); + wait_event_interruptible_timeout(request_queue, -+ gd.transfer = 0, GDROM_DEFAULT_TIMEOUT); ++ gd.transfer == 0, GDROM_DEFAULT_TIMEOUT); + err = gd.transfer; + gd.transfer = 0; + gd.pending = 0; diff --git a/a/content_digest b/N1/content_digest index c194321..5177450 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\01200351607.6196.4.camel@localhost.localdomain\0" "ref\01200352635.6196.8.camel@localhost.localdomain\0" "From\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" - "Subject\0Re: [PATCH] SH/Dreamcast - add support for GD-Rom CDROM drive on\0" + "Subject\0Re: [PATCH] SH/Dreamcast - add support for GD-Rom CDROM drive on SEGA Dreamcast\0" "Date\0Wed, 16 Jan 2008 23:57:57 +0000\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Jens Axboe <jens.axboe@oracle.com>" @@ -214,7 +214,7 @@ "+\n" "+static bool gdrom_data_request(void)\n" "+{\n" - "+\treturn (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) = 8;\n" + "+\treturn (ctrl_inb(GDROM_ALTSTATUS_REG) & 0x88) == 8;\n" "+}\n" "+\n" "+static bool gdrom_wait_clrbusy(void)\n" @@ -323,7 +323,7 @@ "+\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,\n" + "+\twait_event_interruptible_timeout(command_queue, gd.pending == 0,\n" "+\t\tGDROM_DEFAULT_TIMEOUT);\n" "+\tgd.pending = 0;\n" "+\tkfree(spin_command);\n" @@ -363,7 +363,7 @@ "+\t}\n" "+\tgd.pending = 1;\n" "+\tgdrom_packetcommand(gd.cd_info, toc_command);\n" - "+\twait_event_interruptible_timeout(command_queue, gd.pending = 0,\n" + "+\twait_event_interruptible_timeout(command_queue, gd.pending == 0,\n" "+\t\tGDROM_DEFAULT_TIMEOUT);\n" "+\tif (gd.pending) {\n" "+\t\terr = -EINVAL;\n" @@ -456,9 +456,9 @@ "+\t/* read the sense key */\n" "+\tchar sense = ctrl_inb(GDROM_ERROR_REG);\n" "+\tsense &= 0xF0;\n" - "+\tif (sense = 0)\n" + "+\tif (sense == 0)\n" "+\t\treturn CDS_DISC_OK;\n" - "+\tif (sense = 0x20)\n" + "+\tif (sense == 0x20)\n" "+\t\treturn CDS_DRIVE_NOT_READY;\n" "+\t/* default */\n" "+\treturn CDS_NO_INFO;\n" @@ -467,7 +467,7 @@ "+static int gdrom_mediachanged(struct cdrom_device_info *cd_info, int ignore)\n" "+{\n" "+\t/* check the sense key */\n" - "+\treturn (ctrl_inb(GDROM_ERROR_REG) & 0xF0) = 0x60;\n" + "+\treturn (ctrl_inb(GDROM_ERROR_REG) & 0xF0) == 0x60;\n" "+}\n" "+\n" "+/* reset the G1 bus */\n" @@ -516,7 +516,7 @@ "+\t}\n" "+\tgd.pending = 1;\n" "+\tgdrom_packetcommand(gd.cd_info, sense_command);\n" - "+\twait_event_interruptible_timeout(command_queue, gd.pending = 0,\n" + "+\twait_event_interruptible_timeout(command_queue, gd.pending == 0,\n" "+\t\tGDROM_DEFAULT_TIMEOUT);\n" "+\tif (gd.pending)\n" "+\t\tgoto cleanup_sense;\n" @@ -687,7 +687,7 @@ "+\t\t/* start transfer */\n" "+\t\tctrl_outb(1, GDROM_DMA_STATUS_REG);\n" "+\t\twait_event_interruptible_timeout(request_queue,\n" - "+\t\t\tgd.transfer = 0, GDROM_DEFAULT_TIMEOUT);\n" + "+\t\t\tgd.transfer == 0, GDROM_DEFAULT_TIMEOUT);\n" "+\t\terr = gd.transfer;\n" "+\t\tgd.transfer = 0;\n" "+\t\tgd.pending = 0;\n" @@ -945,4 +945,4 @@ " obj-$(CONFIG_VIOCD)\t\t+= viocd.o cdrom.o\n" "+obj-$(CONFIG_GDROM)\t\t+= gdrom.o cdrom.o" -2b65695929f284090a383250aab588bce2976f5021ecff791f2d59de7e224ffb +3b4fa282e98b2fc9eb1eba91666393791fdb392d4bee6dba3d5e374273faf80d
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.