From: Robert Elliott Date: Fri, 14 Nov 2014 23:27:24 +0000 (-0600) Subject: hpsa: always call pci_set_master after pci_enable_device X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~21^2^2~45 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fa604e13bb2a6ef6e89224c80d96af385f533c3;p=pandora-kernel.git hpsa: always call pci_set_master after pci_enable_device If the kernel is booted with the reset_device parameter, which is done for kdump, then the driver needs to call pci_set_master after pci_enable_device to reenable bus mastering (since the preceding pci_disable_device call disables bus mastering). Also, place that after pci_request_regions both in the kdump code and the normal pci_init code. Remove the comment summarizing what pci_set_master does, with the incomplete commentary on the impact of pci_disable_device. Signed-off-by: Robert Elliott Signed-off-by: Don Brace Reviewed-by: Don Brace Signed-off-by: Christoph Hellwig --- Reading git-diff-tree failed