[PATCH 3.4 155/172] hpsa: add missing pci_set_master in kdump path

From: lizf
Date: Tue Jun 16 2015 - 04:58:23 EST

From: Tomas Henzl <thenzl@xxxxxxxxxx>

3.4.108-rc1 review patch. If anyone has any objections, please let me know.


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@xxxxxxxxxx>
Reviewed-by: Robert Elliott <elliott@xxxxxx>
Tested-by: Robert Elliott <elliott@xxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Cc: Vinson Lee <vlee@xxxxxxxxxxxxxxxx>
Signed-off-by: Zefan Li <lizefan@xxxxxxxxxx>
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 4b11dcb..c45c6a3 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);


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/