svn commit: r210209 - stable/8/sys/cam/ata

Alexander Motin mav at FreeBSD.org
Sun Jul 18 07:29:38 UTC 2010


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)


More information about the svn-src-stable-8 mailing list