[3.16.y-ckt stable] Patch "hpsa: add missing pci_set_master in kdump path" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    hpsa: add missing pci_set_master in kdump path

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt10.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 5b45c91d83c70f77d9725d0f1be8f74834c82e48 Mon Sep 17 00:00:00 2001
From: Tomas Henzl <thenzl at redhat.com>
Date: Fri, 12 Sep 2014 14:44:15 +0200
Subject: 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 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);