Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363320
b: refs/heads/master
c: 8137211
h: refs/heads/master
v: v3
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent 7770dce commit 2322fda
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4fcf94980c994ed992d8efd1424bd842225f1cc6
refs/heads/master: 81372118c6fc12d41b6e978b915cc010fe6e5700
3 changes: 1 addition & 2 deletions trunk/drivers/staging/slicoss/slicoss.c
Original file line number Diff line number Diff line change
Expand Up @@ -901,10 +901,9 @@ static void slic_timer_load_check(ulong cardaddr)
u32 load = card->events;
u32 level = 0;

intagg = &adapter->slic_regs->slic_intagg;

if ((adapter) && (adapter->state == ADAPT_UP) &&
(card->state == CARD_UP) && (slic_global.dynamic_intagg)) {
intagg = &adapter->slic_regs->slic_intagg;
if (adapter->devid == SLIC_1GB_DEVICE_ID) {
if (adapter->linkspeed == LINK_1000MB)
level = 100;
Expand Down

0 comments on commit 2322fda

Please sign in to comment.