Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b14aa6dc authored by Mike Miller's avatar Mike Miller Committed by Jens Axboe
Browse files

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: default avatarMike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 256aea3f

drivers/block/cciss.c

+1 −1
Original line number Diff line number Diff line
@@ -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 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) 
	 * Smart Array controllers that pci_enable_device does not undo

	 */

	pci_release_regions(pdev);

	cciss_put_controller_into_performant_mode(c);

	return err;

}