1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 486f94ef24d4..8004ac30a7a8 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -24,6 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/pci-aspm.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -4319,6 +4320,10 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
                 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
                 return -ENODEV;
         }
+
+        pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
+                                PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
+
         err = pci_enable_device(h->pdev);
         if (err) {
                 dev_warn(&h->pdev->dev, "Unable to Enable PCI device\n");
@@ -5158,6 +5163,7 @@ reinit_after_soft_reset:
         h->cciss_max_sectors = 8192;
 
         rebuild_lun_table(h, 1, 0);
+        cciss_engage_scsi(h);
         h->busy_initializing = 0;
         return 1;