[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>
(cherry picked from commit 5cb460a640cc733fee03adbbc9257246e6c3de08)

Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 12c9019c99c55d454418144e2b6b0145adf48b0b..326f036d99fa0cc903648877192998cf12203d49 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3954,6 +3954,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,