From: Tomas Henzl <thenzl@redhat.com>
Date: Fri, 12 Sep 2014 12:44:15 +0000 (+0200)
Subject: hpsa: add missing pci_set_master in kdump path
X-Git-Tag: v3.16.35~2341
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b45c91d83c70f77d9725d0f1be8f74834c82e48;p=thirdparty%2Fkernel%2Fstable.git

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: Masoud Sharbiani <msharbiani@twopensource.com>
Cc: Vinson Lee <vlee@twopensource.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 67a8dfd9b3f52..28533dbd3407a 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);