From f666987bdcc957e5495e3dbd2e008e6de54ac5ae Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Fri, 22 Jul 2011 05:50:25 +0000 Subject: [PATCH] --- yaml --- r: 258427 b: refs/heads/master c: 781223a15c510b4cb11328603bfc41ec8352f015 h: refs/heads/master i: 258425: 0af80838af45f8b1c67787a9b26c928b0e4fcfb7 258423: 976c394ee7642d1865452bcafe6e1643611f0726 v: v3 --- [refs] | 2 +- trunk/drivers/net/wan/sbni.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c060f41a24bf..3449a3f35be9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccbae55e1c6dc18e95d72c044cf9345ea08abf7b +refs/heads/master: 781223a15c510b4cb11328603bfc41ec8352f015 diff --git a/trunk/drivers/net/wan/sbni.c b/trunk/drivers/net/wan/sbni.c index 40e95facdb6c..86127bcc9f7a 100644 --- a/trunk/drivers/net/wan/sbni.c +++ b/trunk/drivers/net/wan/sbni.c @@ -303,7 +303,6 @@ sbni_pci_probe( struct net_device *dev ) != NULL ) { int pci_irq_line; unsigned long pci_ioaddr; - u16 subsys; if( pdev->vendor != SBNI_PCI_VENDOR && pdev->device != SBNI_PCI_DEVICE ) @@ -314,9 +313,7 @@ sbni_pci_probe( struct net_device *dev ) /* Avoid already found cards from previous calls */ if( !request_region( pci_ioaddr, SBNI_IO_EXTENT, dev->name ) ) { - pci_read_config_word( pdev, PCI_SUBSYSTEM_ID, &subsys ); - - if (subsys != 2) + if (pdev->subsystem_device != 2) continue; /* Dual adapter is present */