From 98665867597a7668e169914dc195417ab9af6b99 Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Mon, 18 Jul 2011 23:38:47 +0100 Subject: [PATCH] --- yaml --- r: 267374 b: refs/heads/master c: 6a342657982209a8982981f8d38366adac2b9f15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et1310_mac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a3fef8156a52..d4ec33e74cf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc78050f67fb662395180296ac7132dab256245e +refs/heads/master: 6a342657982209a8982981f8d38366adac2b9f15 diff --git a/trunk/drivers/staging/et131x/et1310_mac.c b/trunk/drivers/staging/et131x/et1310_mac.c index 8d8bc8bbabf3..d1847c1614b4 100644 --- a/trunk/drivers/staging/et131x/et1310_mac.c +++ b/trunk/drivers/staging/et131x/et1310_mac.c @@ -526,7 +526,7 @@ void et1310_handle_macstat_interrupt(struct et131x_adapter *etdev) carry_reg1 = readl(&etdev->regs->macstat.carry_reg1); carry_reg2 = readl(&etdev->regs->macstat.carry_reg2); - writel(carry_reg2, &etdev->regs->macstat.carry_reg1); + writel(carry_reg1, &etdev->regs->macstat.carry_reg1); writel(carry_reg2, &etdev->regs->macstat.carry_reg2); /* We need to do update the host copy of all the MAC_STAT counters.