diff --git a/[refs] b/[refs] index 7bd4d9013d6a..5c9b8e39e3a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 256aea3fd3b5c43e8d05ce66eaf43def83773612 +refs/heads/master: b14aa6dcd083ad00fb416a93f76131734e6c3c17 diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index 4f59f03f91ff..156ea365c14d 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/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 @@ 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; }