summaryrefslogtreecommitdiff
path: root/drivers/net/ks8851_mll.c
diff options
context:
space:
mode:
authorChoi, David <David.Choi@Micrel.Com>2010-01-27 06:03:16 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 08:49:39 -0700
commit7f376b982b1751df9e0bf8b5f38337084c2d1215 (patch)
treedea255c38cc1a4f16be1e2443a587c684eff393f /drivers/net/ks8851_mll.c
parentc191a795447dd22e3f504bdc627ec79126629697 (diff)
drivers/net: ks8851_mll ethernet network driver
[ Upstream commit aeedba8bd2cf2f6f7b45bc7853754a03bc926797 ] Hello David Miller, I fix a bug in ks8851_mll driver, which has existed since 2.6.32-rc6. >From : David J. Choi <david.choi@micrel.com> Fix a bug that the data pointers in the interrupt handler are set wrong, which is related with the 5th parameter of request_irq(). Signed-off-by: David J. Choi <david.choi@micrel.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/ks8851_mll.c')
-rw-r--r--drivers/net/ks8851_mll.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c
index c146304d8d6c..c0ceebccaa49 100644
--- a/drivers/net/ks8851_mll.c
+++ b/drivers/net/ks8851_mll.c
@@ -854,8 +854,8 @@ static void ks_update_link_status(struct net_device *netdev, struct ks_net *ks)
static irqreturn_t ks_irq(int irq, void *pw)
{
- struct ks_net *ks = pw;
- struct net_device *netdev = ks->netdev;
+ struct net_device *netdev = pw;
+ struct ks_net *ks = netdev_priv(netdev);
u16 status;
/*this should be the first in IRQ handler */