summaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
authorIvan Vecera <ivecera@redhat.com>2008-04-17 22:48:41 +0200
committerFrancois Romieu <romieu@fr.zoreil.com>2008-04-17 22:48:41 +0200
commit21e197f231343201368338603cb0909a13961bac (patch)
tree697b93be0ba9df2fbc481f72d7950b76be314ed1 /drivers/net/r8169.c
parentcee60c377de6d9d10f0a2876794149bd79a15020 (diff)
downloadop-kernel-dev-21e197f231343201368338603cb0909a13961bac.zip
op-kernel-dev-21e197f231343201368338603cb0909a13961bac.tar.gz
r8169: fix oops in r8169_get_mac_version
r8169_get_mac_version crashes when it meets an unknown MAC due to tp->pci_dev not being set. Initialize it early. Signed-off-by: Ivan Vecera <ivecera@redhat.com> Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r--drivers/net/r8169.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 5e8ad63..6572425 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1617,6 +1617,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
SET_NETDEV_DEV(dev, &pdev->dev);
tp = netdev_priv(dev);
tp->dev = dev;
+ tp->pci_dev = pdev;
tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);
/* enable device (incl. PCI PM wakeup and hotplug setup) */
@@ -1777,7 +1778,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
#endif
tp->intr_mask = 0xffff;
- tp->pci_dev = pdev;
tp->mmio_addr = ioaddr;
tp->align = cfg->align;
tp->hw_start = cfg->hw_start;
OpenPOWER on IntegriCloud