Author: adrian Date: Fri Jun 14 06:14:49 2013 New Revision: 251735 URL: http://svnweb.freebsd.org/changeset/base/251735
Log: If chan is NULL, don't derefrence it. The bluetooth setup code actually does a channel lookup during setup, even though we haven't yet programmed in a channel. Sigh. Tested: * WB225 (AR9485) + bluetooth Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c ============================================================================== --- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Fri Jun 14 05:36:47 2013 (r251734) +++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c Fri Jun 14 06:14:49 2013 (r251735) @@ -778,6 +778,11 @@ ar9300_set_delta_slope(struct ath_hal *a HAL_CHANNEL_INTERNAL * ar9300_check_chan(struct ath_hal *ah, const struct ieee80211_channel *chan) { + + if (chan == NULL) { + return AH_NULL; + } + if ((IS(chan, CHAN_2GHZ) ^ IS(chan, CHAN_5GHZ)) == 0) { HALDEBUG(ah, HAL_DEBUG_CHANNEL, "%s: invalid channel %u/0x%x; not marked as 2GHz or 5GHz\n", _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"