[PATCH 3.16.y-ckt 138/144] hpsa: add missing pci_set_master in kdump path
Luis Henriques
luis.henriques at canonical.com
Tue Apr 21 15:32:03 UTC 2015
3.16.7-ckt10 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Henzl <thenzl at redhat.com>
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 at redhat.com>
Reviewed-by: Robert Elliott <elliott at hp.com>
Tested-by: Robert Elliott <elliott at hp.com>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Cc: Masoud Sharbiani <msharbiani at twopensource.com>
Cc: Vinson Lee <vlee at twopensource.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/scsi/hpsa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 67a8dfd9b3f5..28533dbd3407 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6549,7 +6549,7 @@ static 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);
More information about the kernel-team
mailing list