From: Mike Miller on
Patch 1 of 5
cciss: call to put_controller_in_performant_mode was in the wrong place
The call inadvertently ended up in an error path.

From: Mike Miller <mike.miller(a)hp.com>

Signed-off-by: Mike Miller <mike.miller(a)hp.com>
Cc: Stephen M. Cameron <scameron(a)beardog.cce.hp.com>, iss_storagedev(a)hp.com
---
drivers/block/cciss.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 5e215ff..cdc671c 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;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/