Unverified Commit 2938c218 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11888 pci/hotplug/pnv_php: Fix hotplug driver crash on Powernv 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CQJEQNL5XV6BZ5K7YBCW3BULLXEPHZUU/ 
 
https://gitee.com/src-openeuler/kernel/issues/IARWMF 
 
Link:https://gitee.com/openeuler/kernel/pulls/11888

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 7e717645 dcfa4747

drivers/pci/hotplug/pnv_php.c

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot, 
				bool disable_device)

{

	struct pci_dev *pdev = php_slot->pdev;

	int irq = php_slot->irq;

	u16 ctrl;



	if (php_slot->irq > 0) {
@@ -54,7 +53,7 @@ static void pnv_php_disable_irq(struct pnv_php_slot *php_slot, 
		php_slot->wq = NULL;

	}



	if (disable_device || irq > 0) {

	if (disable_device) {

		if (pdev->msix_enabled)

			pci_disable_msix(pdev);

		else if (pdev->msi_enabled)