From 2322fda83c4f89554df82ba145d308ce8f9c30c2 Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Tue, 19 Feb 2013 05:13:50 +0100
Subject: [PATCH] --- yaml --- r: 363320 b: refs/heads/master c:
 81372118c6fc12d41b6e978b915cc010fe6e5700 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/slicoss/slicoss.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3c5eb7e77e94..08d7abe0f851 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fcf94980c994ed992d8efd1424bd842225f1cc6
+refs/heads/master: 81372118c6fc12d41b6e978b915cc010fe6e5700
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
index 76fc2e554f35..753993c867fa 100644
--- a/trunk/drivers/staging/slicoss/slicoss.c
+++ b/trunk/drivers/staging/slicoss/slicoss.c
@@ -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;