From owner-svn-src-all@FreeBSD.ORG  Tue Oct 12 19:24:29 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 B8E56106564A;
	Tue, 12 Oct 2010 19:24:29 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A7F598FC1A;
	Tue, 12 Oct 2010 19:24:29 +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 o9CJOTfO059432;
	Tue, 12 Oct 2010 19:24:29 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9CJOTB9059430;
	Tue, 12 Oct 2010 19:24:29 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201010121924.o9CJOTB9059430@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Tue, 12 Oct 2010 19:24:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213743 - head/sys/dev/mps
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: Tue, 12 Oct 2010 19:24:29 -0000

Author: mdf
Date: Tue Oct 12 19:24:29 2010
New Revision: 213743
URL: http://svn.freebsd.org/changeset/base/213743

Log:
  Always set cm_complete_data before calling mps_config_complete().
  
  Reviewed by:	ken

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

Modified: head/sys/dev/mps/mps.c
==============================================================================
--- head/sys/dev/mps/mps.c	Tue Oct 12 19:22:03 2010	(r213742)
+++ head/sys/dev/mps/mps.c	Tue Oct 12 19:24:29 2010	(r213743)
@@ -1562,9 +1562,9 @@ mps_read_config_page(struct mps_softc *s
 	cm->cm_flags = MPS_CM_FLAGS_SGE_SIMPLE | MPS_CM_FLAGS_DATAIN;
 	cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE;
 
+	cm->cm_complete_data = params;
 	if (params->callback != NULL) {
 		cm->cm_complete = mps_config_complete;
-		cm->cm_complete_data = params;
 		return (mps_map_command(sc, cm));
 	} else {
 		cm->cm_complete = NULL;