]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bnxt_en: Reject driver probe against all bridge devices
authorRay Jui <ray.jui@broadcom.com>
Tue, 21 Feb 2017 00:25:16 +0000 (19:25 -0500)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 6 Mar 2017 21:35:41 +0000 (13:35 -0800)
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 <ray.jui@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 4e00338a61998de3502d0428c4f71ffc69772316)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index 708218097671e2225e2a7a95ae76a69852e1e740..77bfc12d99cf5e1eec4979de82ab32e9a9977877 100644 (file)
@@ -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)