1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 81c16cba5417..b1b506f31be8 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -452,7 +452,7 @@ static inline void idescsi_add_settings(ide_drive_t *drive) { ; }
  */
 static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi)
 {
-        if (drive->id && (drive->id->config & 0x0060) == 0x20)
+        if ((drive->id[ATA_ID_CONFIG] & 0x0060) == 0x20)
                 set_bit(IDE_AFLAG_DRQ_INTERRUPT, &drive->atapi_flags);
         clear_bit(IDESCSI_SG_TRANSFORM, &scsi->transform);
 #if IDESCSI_DEBUG_LOG
@@ -811,6 +811,7 @@ static int ide_scsi_probe(ide_drive_t *drive)
         struct gendisk *g;
         static int warned;
         int err = -ENOMEM;
+        u16 last_lun;
 
         if (!warned && drive->media == ide_cdrom) {
                 printk(KERN_WARNING "ide-scsi is deprecated for cd burning! Use ide-cd and give dev=/dev/hdX as device\n");
@@ -836,12 +837,12 @@ static int ide_scsi_probe(ide_drive_t *drive)
 
         host->max_id = 1;
 
-        if (drive->id->last_lun)
-                debug_log("%s: id->last_lun=%u\n", drive->name,
-                          drive->id->last_lun);
+        last_lun = drive->id[ATA_ID_LAST_LUN];
+        if (last_lun)
+                debug_log("%s: last_lun=%u\n", drive->name, last_lun);
 
-        if ((drive->id->last_lun & 0x7) != 7)
-                host->max_lun = (drive->id->last_lun & 0x7) + 1;
+        if ((last_lun & 7) != 7)
+                host->max_lun = (last_lun & 7) + 1;
         else
                 host->max_lun = 1;