ide-floppy: use drive->pc_callback instead of pc->callback

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-atapi.c

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 6789b81ea78d20288bf863301cbd2d878480ee77..0c4f45247d86eee9dabc34570dd5f23d55c131f3 100644 (file)
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -31,7 +31,10 @@ 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) {
-               pc->callback(drive);
+               if (drive->media == ide_floppy)
+                       drive->pc_callback(drive);
+               else
+                       pc->callback(drive);
                return ide_stopped;
        }
 
@@ -97,7 +100,10 @@ cmd_finished:
                        return ide_stopped;
                }
                /* Command finished - Call the callback function */
-               pc->callback(drive);
+               if (drive->media == ide_floppy)
+                       drive->pc_callback(drive);
+               else
+                       pc->callback(drive);
                return ide_stopped;
        }