소스 검색

[PATCH] myri10ge return value fix

Andrew Morton wrote:
>   All these functions return error codes, and we're not checking them.  We
>   should.  So there's a patch which marks all these things as __must_check,
>   which causes around 1,500 new warnings.
>

The following patch fixes such a warning in myri10ge.

Check pci_enable_device() return value in myri10ge_resume().

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Brice Goglin 19 년 전
부모
커밋
4c2248cc57
1개의 변경된 파일10개의 추가작업 그리고 3개의 파일을 삭제
  1. 10 3
      drivers/net/myri10ge/myri10ge.c

+ 10 - 3
drivers/net/myri10ge/myri10ge.c

@@ -2412,14 +2412,20 @@ static int myri10ge_resume(struct pci_dev *pdev)
 		return -EIO;
 		return -EIO;
 	}
 	}
 	myri10ge_restore_state(mgp);
 	myri10ge_restore_state(mgp);
-	pci_enable_device(pdev);
+
+	status = pci_enable_device(pdev);
+	if (status < 0) {
+		dev_err(&pdev->dev, "failed to enable device\n");
+		return -EIO;
+	}
+
 	pci_set_master(pdev);
 	pci_set_master(pdev);
 
 
 	status = request_irq(pdev->irq, myri10ge_intr, IRQF_SHARED,
 	status = request_irq(pdev->irq, myri10ge_intr, IRQF_SHARED,
 			     netdev->name, mgp);
 			     netdev->name, mgp);
 	if (status != 0) {
 	if (status != 0) {
 		dev_err(&pdev->dev, "failed to allocate IRQ\n");
 		dev_err(&pdev->dev, "failed to allocate IRQ\n");
-		goto abort_with_msi;
+		goto abort_with_enabled;
 	}
 	}
 
 
 	myri10ge_reset(mgp);
 	myri10ge_reset(mgp);
@@ -2438,7 +2444,8 @@ static int myri10ge_resume(struct pci_dev *pdev)
 
 
 	return 0;
 	return 0;
 
 
-abort_with_msi:
+abort_with_enabled:
+	pci_disable_device(pdev);
 	return -EIO;
 	return -EIO;
 
 
 }
 }