On Thursday 18 December 2008, Borislav Petkov wrote: > There should be no functionality change resulting from this patch. > > Signed-off-by: Borislav Petkov <petkovbb@xxxxxxxxx> > --- > drivers/ide/ide-atapi.c | 35 ++++++++++++++++++++--------------- > 1 files changed, 20 insertions(+), 15 deletions(-) > > diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c > index 5c143b4..5295b26 100644 > --- a/drivers/ide/ide-atapi.c > +++ b/drivers/ide/ide-atapi.c > @@ -514,9 +514,28 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) > cmd_len = COMMAND_SIZE(rq->cmd[0]); > if (cmd_len < ATAPI_MIN_CDB_BYTES) > cmd_len = ATAPI_MIN_CDB_BYTES; > - } else > + > + timeout = rq->timeout; > + expiry = ide_cd_expiry; > + > + } else { > cmd_len = ATAPI_MIN_CDB_BYTES; > > + /* > + * If necessary schedule the packet transfer to occur 'timeout' > + * miliseconds later in ide_delayed_transfer_pc() after the > + * device says it's ready for a packet. > + */ > + if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) { > + timeout = drive->pc_delay; > + expiry = &ide_delayed_transfer_pc; > + } else { > + timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD > + : WAIT_TAPE_CMD; > + expiry = NULL; > + } > + } > + > ireason = ide_read_ireason(drive); > if (drive->media == ide_tape) > ireason = ide_wait_ireason(drive, ireason); > @@ -528,20 +547,6 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) > return ide_do_reset(drive); > } If we add dev_is_idecd() check here in patch #1 it won't be necessary to needlessly move the code around in this patch and it would also result in smaller resulting code (42 bytes saved on x86-32)... [ I updated patches 1-2 accordingly while merging them. ] > - /* > - * If necessary schedule the packet transfer to occur 'timeout' > - * miliseconds later in ide_delayed_transfer_pc() after the device > - * says it's ready for a packet. > - */ > - if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) { > - timeout = drive->pc_delay; > - expiry = &ide_delayed_transfer_pc; > - } else { > - timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD > - : WAIT_TAPE_CMD; > - expiry = NULL; > - } > - > /* Set the interrupt routine */ > ide_set_handler(drive, ide_pc_intr, timeout, expiry); -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html