2 files changed, 11 insertions, 1 deletions

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 619c02d9c862..9f985267c30f 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
  *----------------------------------------------------------------------------*/
 
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 24702
+# define AAC_DRIVER_BUILD 26000
 # define AAC_DRIVER_BRANCH "-ms"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 94d2954d79ae..69692b050e3c 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -966,6 +966,16 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
                         device_config_needed =
                           (((__le32 *)aifcmd->data)[0] ==
                             cpu_to_le32(AifEnAddJBOD)) ? ADD : DELETE;
+                        if (device_config_needed == ADD) {
+                                device = scsi_device_lookup(dev->scsi_host_ptr,
+                                        channel,
+                                        id,
+                                        lun);
+                                if (device) {
+                                        scsi_remove_device(device);
+                                        scsi_device_put(device);
+                                }
+                        }
                         break;
 
                 case AifEnEnclosureManagement: