3.16.7-ckt10 -stable review patch.  If anyone has any objections, please let me 
know.

------------------

From: Tomas Henzl <[email protected]>

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 <[email protected]>
Reviewed-by: Robert Elliott <[email protected]>
Tested-by: Robert Elliott <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
Cc: Masoud Sharbiani <[email protected]>
Cc: Vinson Lee <[email protected]>
Signed-off-by: Luis Henriques <[email protected]>
---
 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);
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to