From owner-svn-src-head@FreeBSD.ORG  Tue Nov 27 19:09:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6034EB45;
 Tue, 27 Nov 2012 19:09:37 +0000 (UTC)
 (envelope-from bschmidt@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 4551F8FC15;
 Tue, 27 Nov 2012 19:09:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qARJ9bPY036523;
 Tue, 27 Nov 2012 19:09:37 GMT
 (envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qARJ9bST036522;
 Tue, 27 Nov 2012 19:09:37 GMT
 (envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201211271909.qARJ9bST036522@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Tue, 27 Nov 2012 19:09:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243622 - head/sys/dev/iwn
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: Tue, 27 Nov 2012 19:09:37 -0000

Author: bschmidt
Date: Tue Nov 27 19:09:36 2012
New Revision: 243622
URL: http://svnweb.freebsd.org/changeset/base/243622

Log:
  fix a panic resulting from a stray '&'
  
  MFC after:	1 week

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Tue Nov 27 19:07:28 2012	(r243621)
+++ head/sys/dev/iwn/if_iwn.c	Tue Nov 27 19:09:36 2012	(r243622)
@@ -1253,7 +1253,7 @@ iwn_dma_contig_free(struct iwn_dma_info 
 			bus_dmamap_sync(dma->tag, dma->map,
 			    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 			bus_dmamap_unload(dma->tag, dma->map);
-			bus_dmamem_free(dma->tag, &dma->vaddr, dma->map);
+			bus_dmamem_free(dma->tag, dma->vaddr, dma->map);
 			dma->vaddr = NULL;
 		}
 		bus_dmamap_destroy(dma->tag, dma->map);