summaryrefslogtreecommitdiffstats
path: root/sys/dev/amr
diff options
context:
space:
mode:
authoremoore <emoore@FreeBSD.org>2002-12-13 17:27:44 +0000
committeremoore <emoore@FreeBSD.org>2002-12-13 17:27:44 +0000
commit1dae8083ca7b6545474136b272778e8da64a34d2 (patch)
tree1d670f6535ec677f9c408ec205741b797ce4ca6e /sys/dev/amr
parent311f3f365619895fe10f9545c7a024b5e4f929eb (diff)
downloadFreeBSD-src-1dae8083ca7b6545474136b272778e8da64a34d2.zip
FreeBSD-src-1dae8083ca7b6545474136b272778e8da64a34d2.tar.gz
Problem: Hang while bootup on Perc2/SC.
Fix: Error handling wasn't implemented in newly implemented polling code for quartz controllers. Approved by: re@
Diffstat (limited to 'sys/dev/amr')
-rw-r--r--sys/dev/amr/amr.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 59a83f8..0f5831a 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -977,6 +977,7 @@ amr_quartz_poll_command(struct amr_command *ac)
{
struct amr_softc *sc = ac->ac_sc;
int s;
+ int error;
debug_called(2);
@@ -1006,6 +1007,8 @@ amr_quartz_poll_command(struct amr_command *ac)
while(sc->amr_mailbox->mb_nstatus == 0xFF);
while(sc->amr_mailbox->mb_status == 0xFF);
+ ac->ac_status=sc->amr_mailbox->mb_status;
+ error = (ac->ac_status !=AMR_STATUS_SUCCESS) ? 1:0;
while(sc->amr_mailbox->mb_poll != 0x77);
sc->amr_mailbox->mb_poll = 0;
sc->amr_mailbox->mb_ack = 0x77;
@@ -1018,8 +1021,7 @@ amr_quartz_poll_command(struct amr_command *ac)
/* unmap the command's data buffer */
amr_unmapcmd(ac);
- ac->ac_status=0;
- return(0);
+ return(error);
}
/********************************************************************************
OpenPOWER on IntegriCloud