diff --git a/[refs] b/[refs] index e6d70b4dd1f9..5e2c38f905e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6941727a08d49c88a58bc3afb55044df7932549e +refs/heads/master: 7ad62dbcb5766dae38516e0333a6f68a1b6df884 diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index 523478ebfd69..0f3d230a320d 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/drivers/net/s2io.c @@ -1113,9 +1113,10 @@ static int s2io_on_nec_bridge(struct pci_dev *s2io_pdev) struct pci_dev *tdev = NULL; while ((tdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, tdev)) != NULL) { if (tdev->vendor == NEC_VENID && tdev->device == NEC_DEVID) { - if (tdev->bus == s2io_pdev->bus->parent) + if (tdev->bus == s2io_pdev->bus->parent) { pci_dev_put(tdev); return 1; + } } } return 0;