diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-17 14:32:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-17 14:32:34 +1000 |
| commit | d1750b0acebe303f44a162e893ea4244162cad85 (patch) | |
| tree | be46951a0ac122ae4d257f79341dc58b18cad3c2 /drivers | |
| parent | d2084840d8e4dc35c3ae6db87aa5b5c4ff32f7fd (diff) | |
| parent | b908a5a97b7f6355d2b1028f92c796f822df5aa8 (diff) | |
Merge remote-tracking branch 'scsi/for-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/hpsa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 8cf4a0c69baf..9a6e4a2cd072 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -7463,6 +7463,10 @@ static void hpsa_put_ctlr_into_performant_mode(struct ctlr_info *h) if (hpsa_simple_mode) return; + trans_support = readl(&(h->cfgtable->TransportSupport)); + if (!(trans_support & PERFORMANT_MODE)) + return; + /* Check for I/O accelerator mode support */ if (trans_support & CFGTBL_Trans_io_accel1) { transMethod |= CFGTBL_Trans_io_accel1 | @@ -7479,10 +7483,6 @@ static void hpsa_put_ctlr_into_performant_mode(struct ctlr_info *h) } /* TODO, check that this next line h->nreply_queues is correct */ - trans_support = readl(&(h->cfgtable->TransportSupport)); - if (!(trans_support & PERFORMANT_MODE)) - return; - h->nreply_queues = h->msix_vector > 0 ? h->msix_vector : 1; hpsa_get_max_perf_mode_cmds(h); /* Performant mode ring buffer and supporting data structures */ |