diff options
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 2806662a9cf9..780e8be9066e 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -2770,13 +2770,16 @@ SendPortEnable(MPT_ADAPTER *ioc, int portnum, int sleepFlag) | |||
| 2770 | 2770 | ||
| 2771 | /* RAID FW may take a long time to enable | 2771 | /* RAID FW may take a long time to enable |
| 2772 | */ | 2772 | */ |
| 2773 | if ( (ioc->facts.ProductID & MPI_FW_HEADER_PID_PROD_MASK) | 2773 | if (((ioc->facts.ProductID & MPI_FW_HEADER_PID_PROD_MASK) |
| 2774 | > MPI_FW_HEADER_PID_PROD_TARGET_SCSI ) { | 2774 | > MPI_FW_HEADER_PID_PROD_TARGET_SCSI) || |
| 2775 | rc = mpt_handshake_req_reply_wait(ioc, req_sz, (u32*)&port_enable, | 2775 | (ioc->bus_type == SAS)) { |
| 2776 | reply_sz, (u16*)&reply_buf, 300 /*seconds*/, sleepFlag); | 2776 | rc = mpt_handshake_req_reply_wait(ioc, req_sz, |
| 2777 | (u32*)&port_enable, reply_sz, (u16*)&reply_buf, | ||
| 2778 | 300 /*seconds*/, sleepFlag); | ||
| 2777 | } else { | 2779 | } else { |
| 2778 | rc = mpt_handshake_req_reply_wait(ioc, req_sz, (u32*)&port_enable, | 2780 | rc = mpt_handshake_req_reply_wait(ioc, req_sz, |
| 2779 | reply_sz, (u16*)&reply_buf, 30 /*seconds*/, sleepFlag); | 2781 | (u32*)&port_enable, reply_sz, (u16*)&reply_buf, |
| 2782 | 30 /*seconds*/, sleepFlag); | ||
| 2780 | } | 2783 | } |
| 2781 | return rc; | 2784 | return rc; |
| 2782 | } | 2785 | } |