From owner-svn-src-all@FreeBSD.ORG  Thu May 26 09:22:59 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 70B04106564A;
	Thu, 26 May 2011 09:22:59 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FF1D8FC13;
	Thu, 26 May 2011 09:22:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4Q9MxkE052772;
	Thu, 26 May 2011 09:22:59 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4Q9MxnF052770;
	Thu, 26 May 2011 09:22:59 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105260922.p4Q9MxnF052770@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 26 May 2011 09:22:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222303 - head/sys/dev/ath/ath_hal
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 May 2011 09:22:59 -0000

Author: adrian
Date: Thu May 26 09:22:59 2011
New Revision: 222303
URL: http://svn.freebsd.org/changeset/base/222303

Log:
  Fix a bad merge from a previous commit.

Modified:
  head/sys/dev/ath/ath_hal/ah_eeprom_9287.c

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_9287.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_9287.c	Thu May 26 09:16:09 2011	(r222302)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_9287.c	Thu May 26 09:22:59 2011	(r222303)
@@ -126,10 +126,12 @@ v9287EepromSet(struct ath_hal *ah, int p
 	HAL_EEPROM_9287 *ee = AH_PRIVATE(ah)->ah_eeprom;
 
 	switch (param) {
-	case AR_EEP_ANTGAINMAX_2:
-		ee->ee_antennaGainMax[1] = (int8_t) v;
-		return HAL_OK;
-	return HAL_EINVAL;
+		case AR_EEP_ANTGAINMAX_2:
+			ee->ee_antennaGainMax[1] = (int8_t) v;
+			return HAL_OK;
+		default:
+			return HAL_EINVAL;
+	}
 }
 
 static HAL_BOOL