Revert "scsi: aacraid: Reorder Adapter status check"

BugLink: http://bugs.launchpad.net/bugs/1672544
This reverts commit 50fdf33266027d8629d29adc35dec0f9635b29f3.

Revert in favor of upstream stable.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index 2e5338dec621fbff89c8a68acc3ba241173f3239..cfdfecf3456bcb4a3585e5aca7a55110a04ebfaf 100644 (file)
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -436,24 +436,17 @@ static int aac_src_check_health(struct aac_dev *dev)
 {
        u32 status = src_readl(dev, MUnit.OMR);
 
-       /*
-        *      Check to see if the board panic'd.
-        */
-       if (unlikely(status & KERNEL_PANIC))
-               goto err_blink;
-
        /*
         *      Check to see if the board failed any self tests.
         */
        if (unlikely(status & SELF_TEST_FAILED))
-               goto err_out;
+               return -1;
 
        /*
-        *      Check to see if the board failed any self tests.
+        *      Check to see if the board panic'd.
         */
-       if (unlikely(status & MONITOR_PANIC))
-               goto err_out;
-
+       if (unlikely(status & KERNEL_PANIC))
+               return (status >> 16) & 0xFF;
        /*
         *      Wait for the adapter to be up and running.
         */
@@ -463,12 +456,6 @@ static int aac_src_check_health(struct aac_dev *dev)
         *      Everything is OK
         */
        return 0;
-
-err_out:
-       return -1;
-
-err_blink:
-       return (status > 16) & 0xFF;
 }
 
 static inline u32 aac_get_vector(struct aac_dev *dev)