From owner-svn-src-all@FreeBSD.ORG  Mon Aug 20 12:53:30 2012
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 65831106564A;
	Mon, 20 Aug 2012 12:53:30 +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 5103C8FC08;
	Mon, 20 Aug 2012 12:53:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7KCrUbJ036466;
	Mon, 20 Aug 2012 12:53:30 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KCrU1V036464;
	Mon, 20 Aug 2012 12:53:30 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201208201253.q7KCrU1V036464@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 20 Aug 2012 12:53:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239418 - releng/9.1/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: Mon, 20 Aug 2012 12:53:30 -0000

Author: mav
Date: Mon Aug 20 12:53:29 2012
New Revision: 239418
URL: http://svn.freebsd.org/changeset/base/239418

Log:
  MFC r238969:
  Fix kernel panic on `camcontrol reset` for specific target, caused by
  uninitialized cm_targ in mpssas_action_resetdev().
  
  Approved by:	re (kib)

Modified:
  releng/9.1/sys/dev/mps/mps_sas.c
Directory Properties:
  releng/9.1/sys/   (props changed)
  releng/9.1/sys/dev/   (props changed)

Modified: releng/9.1/sys/dev/mps/mps_sas.c
==============================================================================
--- releng/9.1/sys/dev/mps/mps_sas.c	Mon Aug 20 12:17:42 2012	(r239417)
+++ releng/9.1/sys/dev/mps/mps_sas.c	Mon Aug 20 12:53:29 2012	(r239418)
@@ -3003,6 +3003,7 @@ mpssas_action_resetdev(struct mpssas_sof
 	tm->cm_desc.HighPriority.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY;
 	tm->cm_complete = mpssas_resetdev_complete;
 	tm->cm_complete_data = ccb;
+	tm->cm_targ = targ;
 	mps_map_command(sc, tm);
 }