diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 8075c54bac03ca28524806e99cd577939108ab33..8e6c4abc72ec492b772b9cda75fff33cbd486162 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,