From owner-svn-src-all@FreeBSD.ORG  Wed Apr 17 21:21:28 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 987B2CA;
 Wed, 17 Apr 2013 21:21:28 +0000 (UTC)
 (envelope-from hiren@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 8AC8485F;
 Wed, 17 Apr 2013 21:21:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3HLLRvo061954;
 Wed, 17 Apr 2013 21:21:27 GMT (envelope-from hiren@svn.freebsd.org)
Received: (from hiren@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3HLLRWq061952;
 Wed, 17 Apr 2013 21:21:27 GMT (envelope-from hiren@svn.freebsd.org)
Message-Id: <201304172121.r3HLLRWq061952@svn.freebsd.org>
From: Hiren Panchasara <hiren@FreeBSD.org>
Date: Wed, 17 Apr 2013 21:21:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249595 - head/sys/dev/ips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 17 Apr 2013 21:21:28 -0000

Author: hiren
Date: Wed Apr 17 21:21:27 2013
New Revision: 249595
URL: http://svnweb.freebsd.org/changeset/base/249595

Log:
  Improving r249461 by providing a better way to handle the clang warning.
  
  PR:		kern/177164
  Reviewed by:	jhb
  Approved by:	sbruno (mentor)

Modified:
  head/sys/dev/ips/ips.c

Modified: head/sys/dev/ips/ips.c
==============================================================================
--- head/sys/dev/ips/ips.c	Wed Apr 17 21:08:18 2013	(r249594)
+++ head/sys/dev/ips/ips.c	Wed Apr 17 21:21:27 2013	(r249595)
@@ -578,7 +578,7 @@ static int ips_copperhead_queue_init(ips
 {
 	int error;
 	bus_dma_tag_t dmatag;
-	bus_dmamap_t dmamap = NULL;
+	bus_dmamap_t dmamap;
        	if (bus_dma_tag_create(	/* parent    */	sc->adapter_dmatag,
 				/* alignemnt */	1,
 				/* boundary  */	0,
@@ -595,7 +595,7 @@ static int ips_copperhead_queue_init(ips
 				&dmatag) != 0) {
                 device_printf(sc->dev, "can't alloc dma tag for statue queue\n");
 		error = ENOMEM;
-		goto exit;
+		return error;
         }
 	if(bus_dmamem_alloc(dmatag, (void *)&(sc->copper_queue), 
 	   		    BUS_DMA_NOWAIT, &dmamap)){
@@ -623,7 +623,8 @@ static int ips_copperhead_queue_init(ips
 	
 	return 0;
 exit:
-	bus_dmamem_free(dmatag, sc->copper_queue, dmamap);
+	if (sc->copper_queue != NULL)
+		bus_dmamem_free(dmatag, sc->copper_queue, dmamap);
 	bus_dma_tag_destroy(dmatag);
 	return error;
 }