From 17bfa8e63b0ee029379b956c892e9930dbec8d4b Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 23 Jul 2008 19:55:59 +0200 Subject: [PATCH] --- yaml --- r: 105031 b: refs/heads/master c: db9d286988b9e905045c536f681e85fa5e3a728b h: refs/heads/master i: 105029: 362b328cd7f17f9315b27548942d9523b2019114 105027: a2f24a9175bb8b6d4d3124afd5166e4271101dfc 105023: 810b4c90f5d31b3f12bdfea9d1ed387b34eeb131 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-atapi.c | 10 ++-------- trunk/drivers/scsi/ide-scsi.c | 5 +++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index ad0c9e0630aa..24eb3f2a220b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 776bb0270ea72c40f95347dcac868c9f602dcb3e +refs/heads/master: db9d286988b9e905045c536f681e85fa5e3a728b diff --git a/trunk/drivers/ide/ide-atapi.c b/trunk/drivers/ide/ide-atapi.c index d5249dfc5546..0e9eeb08da2d 100644 --- a/trunk/drivers/ide/ide-atapi.c +++ b/trunk/drivers/ide/ide-atapi.c @@ -31,10 +31,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, debug_log("Enter %s - interrupt handler\n", __func__); if (pc->flags & PC_FLAG_TIMEDOUT) { - if (drive->media == ide_floppy || drive->media == ide_tape) - drive->pc_callback(drive); - else - pc->callback(drive); + drive->pc_callback(drive); return ide_stopped; } @@ -100,10 +97,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, return ide_stopped; } /* Command finished - Call the callback function */ - if (drive->media == ide_floppy || drive->media == ide_tape) - drive->pc_callback(drive); - else - pc->callback(drive); + drive->pc_callback(drive); return ide_stopped; } diff --git a/trunk/drivers/scsi/ide-scsi.c b/trunk/drivers/scsi/ide-scsi.c index 659db3f7ae08..37cfec43bd40 100644 --- a/trunk/drivers/scsi/ide-scsi.c +++ b/trunk/drivers/scsi/ide-scsi.c @@ -229,7 +229,6 @@ static int idescsi_check_condition(ide_drive_t *drive, rq->cmd_type = REQ_TYPE_SENSE; rq->cmd_flags |= REQ_PREEMPT; pc->timeout = jiffies + WAIT_READY; - pc->callback = ide_scsi_callback; /* NOTE! Save the failed packet command in "rq->buffer" */ rq->buffer = (void *) failed_cmd->special; pc->scsi_cmd = ((struct ide_atapi_pc *) failed_cmd->special)->scsi_cmd; @@ -465,6 +464,9 @@ static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi) #if IDESCSI_DEBUG_LOG set_bit(IDESCSI_LOG_CMD, &scsi->log); #endif /* IDESCSI_DEBUG_LOG */ + + drive->pc_callback = ide_scsi_callback; + idescsi_add_settings(drive); } @@ -616,7 +618,6 @@ static int idescsi_queue (struct scsi_cmnd *cmd, pc->scsi_cmd = cmd; pc->done = done; pc->timeout = jiffies + cmd->timeout_per_command; - pc->callback = ide_scsi_callback; if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) { printk ("ide-scsi: %s: que %lu, cmd = ", drive->name, cmd->serial_number);