From owner-svn-src-all@FreeBSD.ORG  Sun Jul 18 07:29:37 2010
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 E5E40106566B;
	Sun, 18 Jul 2010 07:29:37 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D47F18FC12;
	Sun, 18 Jul 2010 07:29:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6I7Tbf6081007;
	Sun, 18 Jul 2010 07:29:37 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6I7TbvQ081005;
	Sun, 18 Jul 2010 07:29:37 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201007180729.o6I7TbvQ081005@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 18 Jul 2010 07:29:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210209 - stable/8/sys/cam/ata
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: Sun, 18 Jul 2010 07:29:38 -0000

Author: mav
Date: Sun Jul 18 07:29:37 2010
New Revision: 210209
URL: http://svn.freebsd.org/changeset/base/210209

Log:
  MFC r208819:
  Fix double free on error.

Modified:
  stable/8/sys/cam/ata/ata_pmp.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/cam/ata/ata_pmp.c
==============================================================================
--- stable/8/sys/cam/ata/ata_pmp.c	Sun Jul 18 07:23:00 2010	(r210208)
+++ stable/8/sys/cam/ata/ata_pmp.c	Sun Jul 18 07:29:37 2010	(r210209)
@@ -737,10 +737,8 @@ pmpdone(struct cam_periph *periph, union
 			if (xpt_create_path(&dpath, periph,
 			    xpt_path_path_id(periph->path),
 			    i, 0) != CAM_REQ_CMP) {
-				printf("pmpdone: xpt_create_path failed"
-				    ", bus scan halted\n");
-				xpt_free_ccb(done_ccb);
-				goto done;
+				printf("pmpdone: xpt_create_path failed\n");
+				continue;
 			}
 			/* If we did hard reset to this device, inform XPT. */
 			if ((softc->reset & softc->found & (1 << i)) != 0)