3 files changed, 4 insertions, 8 deletions

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index e6b41dbbec82..d0eecd4bec83 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 2409
-# define AAC_DRIVER_BRANCH "-mh1"
+# define AAC_DRIVER_BRANCH "-mh2"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
 
@@ -822,10 +822,6 @@ struct fib {
         void                    *callback_data;
         u32                     flags; // u32 dmb was ulong
         /*
-         *      The following is used to put this fib context onto the 
-         *      Outstanding I/O queue.
-         */
-        /*
          *      And for the internal issue/reply queues (we may be able
          *      to merge these two)
          */
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 1d43c17642c0..35b0a6ebd3f5 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -103,7 +103,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
          * This assumes the memory is mapped zero->n, which isnt
          * always true on real computers. It also has some slight problems
          * with the GART on x86-64. I've btw never tried DMA from PCI space
-         * on this platform but don't be suprised if its problematic.
+         * on this platform but don't be surprised if its problematic.
          */
 #ifndef CONFIG_GART_IOMMU
         if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index bd6a67dd2506..b2a5c7262f36 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -85,9 +85,9 @@ unsigned int aac_response_normal(struct aac_queue * q)
                  *      continue. The caller has already been notified that
                  *      the fib timed out.
                  */
-                if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
+                if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
                         dev->queues->queue[AdapNormCmdQueue].numpending--;
-                } else {
+                else {
                         printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
                         printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib);
                         continue;