[SCSI] hpsa: enable bus master bit after pci_enable_device

pci_disable_device() disables the bus master bit and pci_enable_device does
not re-enable it.  It needs to be enabled.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 8075c54bac03..8e6c4abc72ec 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3930,6 +3930,9 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
                 return err;
         }
 
+        /* Enable bus mastering (pci_disable_device may disable this) */
+        pci_set_master(h->pdev);
+
         err = pci_request_regions(h->pdev, HPSA);
         if (err) {
                 dev_err(&h->pdev->dev,