aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-atapi.c
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2008-07-23 19:55:59 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 19:55:59 +0200
commitdb9d286988b9e905045c536f681e85fa5e3a728b (patch)
tree874144e07a0498c4d65dd9695f90056cbe45a1cb /drivers/ide/ide-atapi.c
parent776bb0270ea72c40f95347dcac868c9f602dcb3e (diff)
downloadkernel_samsung_crespo-db9d286988b9e905045c536f681e85fa5e3a728b.zip
kernel_samsung_crespo-db9d286988b9e905045c536f681e85fa5e3a728b.tar.gz
kernel_samsung_crespo-db9d286988b9e905045c536f681e85fa5e3a728b.tar.bz2
ide-scsi: use drive->pc_callback instead of pc->callback
There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r--drivers/ide/ide-atapi.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index d5249df..0e9eeb0 100644
--- a/drivers/ide/ide-atapi.c
+++ b/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 @@ cmd_finished:
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;
}