]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
hpsa: add missing pci_set_master in kdump path
authorTomas Henzl <thenzl@redhat.com>
Fri, 12 Sep 2014 12:44:15 +0000 (14:44 +0200)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 21 Apr 2015 10:54:45 +0000 (11:54 +0100)
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>
drivers/scsi/hpsa.c

index 67a8dfd9b3f52117263e49870b62a5f9082ed50d..28533dbd3407a04af5c6e8daa185a62929d2a80a 100644 (file)
@@ -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);