From 1f3029e3ac1710c97db06798ef51e9d019c7eb7e Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Tue, 1 May 2012 11:42:20 -0500 Subject: [PATCH] [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 Signed-off-by: James Bottomley (cherry picked from commit 5cb460a640cc733fee03adbbc9257246e6c3de08) Signed-off-by: Joe Jin --- drivers/scsi/hpsa.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 12c9019c99c5..326f036d99fa 100644 --- 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, -- 2.50.1