diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2012-05-01 11:42:20 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-10 09:10:00 +0100 |
| commit | 5cb460a640cc733fee03adbbc9257246e6c3de08 (patch) | |
| tree | ab353dd196458a85dab1cec05c10b3ddf68fa079 /drivers/scsi/hpsa.c | |
| parent | e754b42424e0bd5949f47118f71720c42b93c6e0 (diff) | |
| download | linux-3.10-5cb460a640cc733fee03adbbc9257246e6c3de08.tar.gz linux-3.10-5cb460a640cc733fee03adbbc9257246e6c3de08.tar.bz2 linux-3.10-5cb460a640cc733fee03adbbc9257246e6c3de08.zip | |
[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>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 8075c54bac0..8e6c4abc72e 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, |