[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1429630329-21748-139-git-send-email-luis.henriques@canonical.com>
Date: Tue, 21 Apr 2015 16:32:03 +0100
From: Luis Henriques <luis.henriques@...onical.com>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org,
kernel-team@...ts.ubuntu.com
Cc: Tomas Henzl <thenzl@...hat.com>, Christoph Hellwig <hch@....de>,
Masoud Sharbiani <msharbiani@...pensource.com>,
Vinson Lee <vlee@...pensource.com>,
Luis Henriques <luis.henriques@...onical.com>
Subject: [PATCH 3.16.y-ckt 138/144] hpsa: add missing pci_set_master in kdump path
3.16.7-ckt10 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Henzl <thenzl@...hat.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@...hat.com>
Reviewed-by: Robert Elliott <elliott@...com>
Tested-by: Robert Elliott <elliott@...com>
Signed-off-by: Christoph Hellwig <hch@....de>
Cc: Masoud Sharbiani <msharbiani@...pensource.com>
Cc: Vinson Lee <vlee@...pensource.com>
Signed-off-by: Luis Henriques <luis.henriques@...onical.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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists