From f7dccec6c60790a5779b4ee251e17f6d58ad87d3 Mon Sep 17 00:00:00 2001
From: Ivan Vecera <ivecera@redhat.com>
Date: Thu, 17 Apr 2008 22:48:41 +0200
Subject: [PATCH] --- yaml --- r: 95355 b: refs/heads/master c:
 21e197f231343201368338603cb0909a13961bac h: refs/heads/master i:   95353:
 cd7490d0ca937560206d9e88bb3d1c1de7eefce9   95351:
 a641ff67e20a51baf47eba289c52fa7c7ba216ea v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r8169.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 98655eefed6a..fb82ac8cae95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cee60c377de6d9d10f0a2876794149bd79a15020
+refs/heads/master: 21e197f231343201368338603cb0909a13961bac
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 5e8ad634490f..657242504621 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/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;