From owner-svn-src-head@FreeBSD.ORG  Fri Jun 14 06:14:50 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1513DDD3;
 Fri, 14 Jun 2013 06:14:50 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 07C591312;
 Fri, 14 Jun 2013 06:14:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E6En1e090255;
 Fri, 14 Jun 2013 06:14:49 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E6EnIs090254;
 Fri, 14 Jun 2013 06:14:49 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201306140614.r5E6EnIs090254@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 14 Jun 2013 06:14:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251735 - head/sys/contrib/dev/ath/ath_hal/ar9300
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jun 2013 06:14:50 -0000

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",