View | Details | Raw Unified | Return to bug 197143 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/wpi/if_wpi.c (-7 / +4 lines)
Lines 2195-2204 Link Here
2195
2195
2196
	r1 = WPI_READ(sc, WPI_INT);
2196
	r1 = WPI_READ(sc, WPI_INT);
2197
2197
2198
	if (r1 == 0xffffffff || (r1 & 0xfffffff0) == 0xa5a5a5a0) {
2198
	if (r1 == 0xffffffff || (r1 & 0xfffffff0) == 0xa5a5a5a0)
2199
		WPI_UNLOCK(sc);
2199
		goto end;	/* Hardware gone! */
2200
		return;	/* Hardware gone! */
2201
	}
2202
2200
2203
	r2 = WPI_READ(sc, WPI_FH_INT);
2201
	r2 = WPI_READ(sc, WPI_FH_INT);
2204
2202
Lines 2222-2229 Link Here
2222
		    "(Hardware Error)");
2220
		    "(Hardware Error)");
2223
		ieee80211_runtask(ic, &sc->sc_reinittask);
2221
		ieee80211_runtask(ic, &sc->sc_reinittask);
2224
		sc->flags &= ~WPI_FLAG_BUSY;
2222
		sc->flags &= ~WPI_FLAG_BUSY;
2225
		WPI_UNLOCK(sc);
2223
		goto end;
2226
		return;
2227
	}
2224
	}
2228
2225
2229
	if ((r1 & (WPI_INT_FH_RX | WPI_INT_SW_RX)) ||
2226
	if ((r1 & (WPI_INT_FH_RX | WPI_INT_SW_RX)) ||
Lines 2241-2247 Link Here
2241
	if (ifp->if_flags & IFF_UP)
2238
	if (ifp->if_flags & IFF_UP)
2242
		WPI_WRITE(sc, WPI_INT_MASK, WPI_INT_MASK_DEF);
2239
		WPI_WRITE(sc, WPI_INT_MASK, WPI_INT_MASK_DEF);
2243
2240
2244
	WPI_UNLOCK(sc);
2241
end:	WPI_UNLOCK(sc);
2245
}
2242
}
2246
2243
2247
static int
2244
static int

Return to bug 197143