diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /drivers/net/tc35815.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'drivers/net/tc35815.c')
| -rw-r--r-- | drivers/net/tc35815.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index b52a1c088f37..d91e95b237b7 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
| @@ -1908,7 +1908,7 @@ static int tc35815_poll(struct napi_struct *napi, int budget) | |||
| 1908 | do { | 1908 | do { |
| 1909 | tc_writel(status, &tr->Int_Src); /* write to clear */ | 1909 | tc_writel(status, &tr->Int_Src); /* write to clear */ |
| 1910 | 1910 | ||
| 1911 | handled = tc35815_do_interrupt(dev, status, limit); | 1911 | handled = tc35815_do_interrupt(dev, status, budget - received); |
| 1912 | if (handled >= 0) { | 1912 | if (handled >= 0) { |
| 1913 | received += handled; | 1913 | received += handled; |
| 1914 | if (received >= budget) | 1914 | if (received >= budget) |