]> 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)
committerJiri Slaby <jslaby@suse.cz>
Tue, 26 May 2015 12:33:43 +0000 (14:33 +0200)
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/scsi/hpsa.c

index 3639f05fafd0e89d8a4f5aa62fb2dd305f7e0146..74f5cebde95a809c1fa6b1efa86e52e8440ab455 100644 (file)
@@ -4477,7 +4477,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);