From owner-svn-src-stable@FreeBSD.ORG  Mon Oct 10 17:39:59 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0CF14106566B;
	Mon, 10 Oct 2011 17:39:59 +0000 (UTC)
	(envelope-from brueffer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EFFD78FC16;
	Mon, 10 Oct 2011 17:39:58 +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 p9AHdwG6073404;
	Mon, 10 Oct 2011 17:39:58 GMT
	(envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9AHdwLM073402;
	Mon, 10 Oct 2011 17:39:58 GMT
	(envelope-from brueffer@svn.freebsd.org)
Message-Id: <201110101739.p9AHdwLM073402@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Mon, 10 Oct 2011 17:39:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226223 - stable/7/sys/dev/ips
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 10 Oct 2011 17:39:59 -0000

Author: brueffer
Date: Mon Oct 10 17:39:58 2011
New Revision: 226223
URL: http://svn.freebsd.org/changeset/base/226223

Log:
  MFC: r198329
  
  Check pointer for NULL before dereferencing it, not after.

Modified:
  stable/7/sys/dev/ips/ips_disk.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/ips/ips_disk.c
==============================================================================
--- stable/7/sys/dev/ips/ips_disk.c	Mon Oct 10 16:31:18 2011	(r226222)
+++ stable/7/sys/dev/ips/ips_disk.c	Mon Oct 10 17:39:58 2011	(r226223)
@@ -192,10 +192,10 @@ ipsd_dump(void *arg, void *virtual, vm_o
 
 	dp = arg;
 	dsc = dp->d_drv1;
-	sc = dsc->sc;
 
 	if (dsc == NULL)
 		return (EINVAL);
+	sc = dsc->sc;
 
 	if (ips_get_free_cmd(sc, &command, 0) != 0) {
 		printf("ipsd: failed to get cmd for dump\n");