From: Ray Jui Date: Tue, 21 Feb 2017 00:25:16 +0000 (-0500) Subject: bnxt_en: Reject driver probe against all bridge devices X-Git-Tag: v4.1.12-93~2^2~5 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d55c3c84357004e7a5cdcac546c0cf7bad6a9c71;p=users%2Fjedix%2Flinux-maple.git bnxt_en: Reject driver probe against all bridge devices Orabug: 25645429 There are additional SoC devices that use the same device ID for bridge and NIC devices. The bnxt driver should reject probe against all bridge devices since it's meant to be used with only endpoint devices. Signed-off-by: Ray Jui Signed-off-by: Michael Chan Signed-off-by: David S. Miller (cherry picked from commit 4e00338a61998de3502d0428c4f71ffc69772316) Signed-off-by: Brian Maly --- diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 708218097671e..77bfc12d99cf5 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -7440,7 +7440,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) struct bnxt *bp; int rc, max_irqs; - if (pdev->device == 0x16cd && pci_is_bridge(pdev)) + if (pci_is_bridge(pdev)) return -ENODEV; if (version_printed++ == 0)