Pull osi into release branch

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

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 8263f752809d2ff64b00bb97f685ae7bbc9657d8..bb90df8bdce4ef7c204f8e93bc664e85649eedfc 100644 (file)
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -463,7 +463,7 @@ static inline unsigned long get_timeout(idescsi_pc_t *pc)
 
 static int idescsi_expiry(ide_drive_t *drive)
 {
-       idescsi_scsi_t *scsi = drive->driver_data;
+       idescsi_scsi_t *scsi = drive_to_idescsi(drive);
        idescsi_pc_t   *pc   = scsi->pc;
 
 #if IDESCSI_DEBUG_LOG