aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMike Miller <mike.miller@hp.com>2010-06-11 13:13:35 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:15:23 +0200
commitb14aa6dcd083ad00fb416a93f76131734e6c3c17 (patch)
tree3f6a103e7d20358f14c7bda51569958b0914f0ca /drivers
parent256aea3fd3b5c43e8d05ce66eaf43def83773612 (diff)
cciss: fix call to put_controller_in_performant_mode
call to put_controller_in_performant_mode was in the wrong place The call inadvertently ended up in an error path. Signed-off-by: Mike Miller <mike.miller@hp.com> Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/cciss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4f59f03f91f..156ea365c14 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4150,6 +4150,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
#ifdef CCISS_DEBUG
printk(KERN_WARNING "Trying to put board into Performant mode\n");
#endif /* CCISS_DEBUG */
+ cciss_put_controller_into_performant_mode(c);
return 0;
err_out_free_res:
@@ -4158,7 +4159,6 @@ err_out_free_res:
* Smart Array controllers that pci_enable_device does not undo
*/
pci_release_regions(pdev);
- cciss_put_controller_into_performant_mode(c);
return err;
}