summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Henzl <thenzl@redhat.com>2014-09-12 14:44:15 +0200
committerZefan Li <lizefan@huawei.com>2015-06-19 11:40:33 +0800
commit554117937a31d12a6c3fa8d98dcb1bde672130dd (patch)
treed71819ffcdc46018567b67ebb447a3bb4fbf2954
parent7de2f4c1f4905163d8496e08f5deca8b8aacd3a6 (diff)
hpsa: add missing pci_set_master in kdump path
commit 859c75aba20264d87dd026bab0d0ca3bff385955 upstream. Add a call to pci_set_master(...) missing in the previous patch "hpsa: refine the pci enable/disable handling". Found thanks to Rob Elliot. Signed-off-by: Tomas Henzl <thenzl@redhat.com> Reviewed-by: Robert Elliott <elliott@hp.com> Tested-by: Robert Elliott <elliott@hp.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: Vinson Lee <vlee@twopensource.com> Signed-off-by: Zefan Li <lizefan@huawei.com>
-rw-r--r--drivers/scsi/hpsa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 4b11dcb4f71b..c45c6a3c1432 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4075,7 +4075,7 @@ static __devinit int hpsa_init_reset_devices(struct pci_dev *pdev)
dev_warn(&pdev->dev, "failed to enable device.\n");
return -ENODEV;
}
-
+ pci_set_master(pdev);
/* Reset the controller with a PCI power-cycle or via doorbell */
rc = hpsa_kdump_hard_reset_controller(pdev);