diff options
Diffstat (limited to 'drivers/net/sis900.c')
-rw-r--r-- | drivers/net/sis900.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 5976d1d51df1..84d4167eee9a 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -495,7 +495,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev, | |||
495 | sis_priv->mii_info.reg_num_mask = 0x1f; | 495 | sis_priv->mii_info.reg_num_mask = 0x1f; |
496 | 496 | ||
497 | /* Get Mac address according to the chip revision */ | 497 | /* Get Mac address according to the chip revision */ |
498 | pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &(sis_priv->chipset_rev)); | 498 | sis_priv->chipset_rev = pci_dev->revision; |
499 | if(netif_msg_probe(sis_priv)) | 499 | if(netif_msg_probe(sis_priv)) |
500 | printk(KERN_DEBUG "%s: detected revision %2.2x, " | 500 | printk(KERN_DEBUG "%s: detected revision %2.2x, " |
501 | "trying to get MAC address...\n", | 501 | "trying to get MAC address...\n", |
@@ -532,7 +532,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev, | |||
532 | /* save our host bridge revision */ | 532 | /* save our host bridge revision */ |
533 | dev = pci_get_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_630, NULL); | 533 | dev = pci_get_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_630, NULL); |
534 | if (dev) { | 534 | if (dev) { |
535 | pci_read_config_byte(dev, PCI_CLASS_REVISION, &sis_priv->host_bridge_rev); | 535 | sis_priv->host_bridge_rev = dev->revision; |
536 | pci_dev_put(dev); | 536 | pci_dev_put(dev); |
537 | } | 537 | } |
538 | 538 | ||
@@ -1777,6 +1777,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1777 | "cur_rx:%4.4d, dirty_rx:%4.4d\n", | 1777 | "cur_rx:%4.4d, dirty_rx:%4.4d\n", |
1778 | net_dev->name, sis_priv->cur_rx, | 1778 | net_dev->name, sis_priv->cur_rx, |
1779 | sis_priv->dirty_rx); | 1779 | sis_priv->dirty_rx); |
1780 | dev_kfree_skb(skb); | ||
1780 | break; | 1781 | break; |
1781 | } | 1782 | } |
1782 | 1783 | ||