Skip to content

Commit

Permalink
cciss: fix call to put_controller_in_performant_mode
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Miller authored and Jens Axboe committed Aug 7, 2010
1 parent 256aea3 commit b14aa6d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/block/cciss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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;
}

Expand Down

0 comments on commit b14aa6d

Please sign in to comment.