3 files changed, 5 insertions, 6 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 37c55ddce214..b14f7cac30e9 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1803,7 +1803,7 @@ static int query_disk(struct aac_dev *dev, void __user *arg)
 
         fsa_dev_ptr = dev->fsa_dev;
         if (!fsa_dev_ptr)
-                return -ENODEV;
+                return -EBUSY;
         if (copy_from_user(&qd, arg, sizeof (struct aac_query_disk)))
                 return -EFAULT;
         if (qd.cnum == -1)
@@ -1842,6 +1842,8 @@ static int force_delete_disk(struct aac_dev *dev, void __user *arg)
         struct fsa_dev_info *fsa_dev_ptr;
 
         fsa_dev_ptr = dev->fsa_dev;
+        if (!fsa_dev_ptr)
+                return -EBUSY;
 
         if (copy_from_user(&dd, arg, sizeof (struct aac_delete_disk)))
                 return -EFAULT;
@@ -1866,9 +1868,7 @@ static int delete_disk(struct aac_dev *dev, void __user *arg)
 
         fsa_dev_ptr = dev->fsa_dev;
         if (!fsa_dev_ptr)
-                return -ENODEV;
-        if (!fsa_dev_ptr)
-                return -ENODEV;
+                return -EBUSY;
 
         if (copy_from_user(&dd, arg, sizeof (struct aac_delete_disk)))
                 return -EFAULT;
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 8924c183d9c3..e5f7be6f3cd6 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1525,7 +1525,6 @@ struct aac_get_name {
         __le32          count;  /* sizeof(((struct aac_get_name_resp *)NULL)->data) */
 };
 
-#define CT_OK        218
 struct aac_get_name_resp {
         __le32          dummy0;
         __le32          dummy1;
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 53add53be0bd..907161d6e92c 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -467,7 +467,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
         dprintk((KERN_DEBUG "  fib being sent=%p\n",fibptr));
 
         if (!dev->queues)
-                return -ENODEV;
+                return -EBUSY;
         q = &dev->queues->queue[AdapNormCmdQueue];
 
         if(wait)