2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index 74d12b58a263..a48e4990fe12 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -25,7 +25,6 @@
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/spinlock.h>
-#include <linux/hdreg.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/div64.h>
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index b40a673985aa..461331d3dc45 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -102,11 +102,10 @@ static struct ide_scsi_obj *ide_scsi_get(struct gendisk *disk)
         mutex_lock(&idescsi_ref_mutex);
         scsi = ide_scsi_g(disk);
         if (scsi) {
-                scsi_host_get(scsi->host);
-                if (ide_device_get(scsi->drive)) {
-                        scsi_host_put(scsi->host);
+                if (ide_device_get(scsi->drive))
                         scsi = NULL;
-                }
+                else
+                        scsi_host_get(scsi->host);
         }
         mutex_unlock(&idescsi_ref_mutex);
         return scsi;
@@ -114,9 +113,11 @@ static struct ide_scsi_obj *ide_scsi_get(struct gendisk *disk)
 
 static void ide_scsi_put(struct ide_scsi_obj *scsi)
 {
+        ide_drive_t *drive = scsi->drive;
+
         mutex_lock(&idescsi_ref_mutex);
-        ide_device_put(scsi->drive);
         scsi_host_put(scsi->host);
+        ide_device_put(drive);
         mutex_unlock(&idescsi_ref_mutex);
 }