From owner-svn-src-head@FreeBSD.ORG Sat Jul 30 13:46:42 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0303C1065673; Sat, 30 Jul 2011 13:46:42 +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 E61DF8FC15; Sat, 30 Jul 2011 13:46:41 +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 p6UDkfxC002549; Sat, 30 Jul 2011 13:46:41 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6UDkfsq002547; Sat, 30 Jul 2011 13:46:41 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201107301346.p6UDkfsq002547@svn.freebsd.org> From: Adrian Chadd Date: Sat, 30 Jul 2011 13:46:41 +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: r224520 - head/sys/dev/ath/ath_dfs/null X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jul 2011 13:46:42 -0000 Author: adrian Date: Sat Jul 30 13:46:41 2011 New Revision: 224520 URL: http://svn.freebsd.org/changeset/base/224520 Log: Fix incorrect error reporting during the dfs ioctl function. Approved by: re (kib) Modified: head/sys/dev/ath/ath_dfs/null/dfs_null.c Modified: head/sys/dev/ath/ath_dfs/null/dfs_null.c ============================================================================== --- head/sys/dev/ath/ath_dfs/null/dfs_null.c Sat Jul 30 13:45:12 2011 (r224519) +++ head/sys/dev/ath/ath_dfs/null/dfs_null.c Sat Jul 30 13:46:41 2011 (r224520) @@ -189,7 +189,7 @@ ath_ioctl_phyerr(struct ath_softc *sc, s switch (id) { case DFS_SET_THRESH: if (insize < sizeof(HAL_PHYERR_PARAM)) { - error = -EINVAL; + error = EINVAL; break; } pe = (HAL_PHYERR_PARAM *) indata; @@ -203,12 +203,12 @@ ath_ioctl_phyerr(struct ath_softc *sc, s memcpy(pe, &peout, sizeof(*pe)); break; default: - error = -EINVAL; + error = EINVAL; } if (outsize < ad->ad_out_size) ad->ad_out_size = outsize; if (outdata && copyout(outdata, ad->ad_out_data, ad->ad_out_size)) - error = -EFAULT; + error = EFAULT; bad: if ((ad->ad_id & ATH_DIAG_IN) && indata != NULL) free(indata, M_TEMP);