diff options
author | Mike Miller <mike.miller@hp.com> | 2010-06-11 07:13:35 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 12:15:23 -0400 |
commit | b14aa6dcd083ad00fb416a93f76131734e6c3c17 (patch) | |
tree | 3f6a103e7d20358f14c7bda51569958b0914f0ca | |
parent | 256aea3fd3b5c43e8d05ce66eaf43def83773612 (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>
-rw-r--r-- | 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 4f59f03f91ff..156ea365c14d 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) | |||
4150 | #ifdef CCISS_DEBUG | 4150 | #ifdef CCISS_DEBUG |
4151 | printk(KERN_WARNING "Trying to put board into Performant mode\n"); | 4151 | printk(KERN_WARNING "Trying to put board into Performant mode\n"); |
4152 | #endif /* CCISS_DEBUG */ | 4152 | #endif /* CCISS_DEBUG */ |
4153 | cciss_put_controller_into_performant_mode(c); | ||
4153 | return 0; | 4154 | return 0; |
4154 | 4155 | ||
4155 | err_out_free_res: | 4156 | err_out_free_res: |
@@ -4158,7 +4159,6 @@ err_out_free_res: | |||
4158 | * Smart Array controllers that pci_enable_device does not undo | 4159 | * Smart Array controllers that pci_enable_device does not undo |
4159 | */ | 4160 | */ |
4160 | pci_release_regions(pdev); | 4161 | pci_release_regions(pdev); |
4161 | cciss_put_controller_into_performant_mode(c); | ||
4162 | return err; | 4162 | return err; |
4163 | } | 4163 | } |
4164 | 4164 | ||