shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

pci/hotplug/pnv-php: Disable surprise hotplug capability on conflicts

Browse Source 
am: 54eff720c9

Change-Id: I1420772893847955dfd3ae3c1746a72e8cb849e3
This commit is contained in:
Gavin Shan
2017-03-15 02:23:19 +00:00
committed by android-build-merger
parent 867461fafe 54eff720c9
commit 9ac636111c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/hotplug/pnv_php.c
View File

@@ -799,6 +799,14 @@ static void pnv_php_enable_irq(struct pnv_php_slot *php_slot)
struct pci_dev *pdev = php_slot->pdev;
int irq, ret;
/*
* The MSI/MSIx interrupt might have been occupied by other
* drivers. Don't populate the surprise hotplug capability
* in that case.
*/
if (pci_dev_msi_enabled(pdev))
return;
ret = pci_enable_device(pdev);
if (ret) {
dev_warn(&pdev->dev, "Error %d enabling device\n", ret);