git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scsi: aacraid: Fix typo in blink status
[pandora-kernel.git]
/
drivers
/
scsi
/
aacraid
/
src.c
diff --git
a/drivers/scsi/aacraid/src.c
b/drivers/scsi/aacraid/src.c
index
957595a
..
e4077e2
100644
(file)
--- a/
drivers/scsi/aacraid/src.c
+++ b/
drivers/scsi/aacraid/src.c
@@
-316,17
+316,24
@@
static int aac_src_check_health(struct aac_dev *dev)
{
u32 status = src_readl(dev, MUnit.OMR);
{
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))
/*
* Check to see if the board failed any self tests.
*/
if (unlikely(status & SELF_TEST_FAILED))
-
return -1
;
+
goto err_out
;
/*
/*
- * Check to see if the board
panic'd
.
+ * Check to see if the board
failed any self tests
.
*/
*/
- if (unlikely(status & KERNEL_PANIC))
- return (status >> 16) & 0xFF;
+ if (unlikely(status & MONITOR_PANIC))
+ goto err_out;
+
/*
* Wait for the adapter to be up and running.
*/
/*
* Wait for the adapter to be up and running.
*/
@@
-336,6
+343,12
@@
static int aac_src_check_health(struct aac_dev *dev)
* Everything is OK
*/
return 0;
* Everything is OK
*/
return 0;
+
+err_out:
+ return -1;
+
+err_blink:
+ return (status >> 16) & 0xFF;
}
/**
}
/**