From owner-svn-src-stable@FreeBSD.ORG  Tue Jun 25 07:11:08 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 B3DFDBE8;
 Tue, 25 Jun 2013 07:11:08 +0000 (UTC) (envelope-from mav@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 A6F9F1779;
 Tue, 25 Jun 2013 07:11:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5P7B8MA009259;
 Tue, 25 Jun 2013 07:11:08 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5P7B8aL009258;
 Tue, 25 Jun 2013 07:11:08 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306250711.r5P7B8aL009258@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 25 Jun 2013 07:11:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r252198 - stable/8/sys/dev/ata/chipsets
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jun 2013 07:11:08 -0000

Author: mav
Date: Tue Jun 25 07:11:07 2013
New Revision: 252198
URL: http://svnweb.freebsd.org/changeset/base/252198

Log:
  MFC r251945:
  Pass proper memory type to free() in ata_ali_chipinit().

Modified:
  stable/8/sys/dev/ata/chipsets/ata-acerlabs.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/ata/   (props changed)

Modified: stable/8/sys/dev/ata/chipsets/ata-acerlabs.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-acerlabs.c	Tue Jun 25 07:05:08 2013	(r252197)
+++ stable/8/sys/dev/ata/chipsets/ata-acerlabs.c	Tue Jun 25 07:11:07 2013	(r252198)
@@ -134,7 +134,7 @@ ata_ali_chipinit(device_t dev)
 			for (i--; i >=0; i--)
 				bus_release_resource(dev, SYS_RES_IOPORT,
 				    PCIR_BAR(i), res->bars[i]);
-			free(res, M_TEMP);
+			free(res, M_ATAPCI);
 			return ENXIO;
 		}
 	}