From owner-svn-src-stable@FreeBSD.ORG  Mon Apr  8 23:06:26 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1496CE65;
 Mon,  8 Apr 2013 23:06:26 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 05CEB23C;
 Mon,  8 Apr 2013 23:06:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r38N6PVu057711;
 Mon, 8 Apr 2013 23:06:25 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r38N6P7P057710;
 Mon, 8 Apr 2013 23:06:25 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201304082306.r38N6P7P057710@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 8 Apr 2013 23:06:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r249290 - in stable: 8/sys/dev/mfi 9/sys/dev/mfi
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 08 Apr 2013 23:06:26 -0000

Author: delphij
Date: Mon Apr  8 23:06:25 2013
New Revision: 249290
URL: http://svnweb.freebsd.org/changeset/base/249290

Log:
  MFC r248627:
  
  Don't attempt to reference sc before testing whether it's NULL.
  
  Submitted by:	Sascha Wildner
  Obtained from:	DragonFly

Modified:
  stable/9/sys/dev/mfi/mfi_disk.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/8/sys/dev/mfi/mfi_disk.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/mfi/   (props changed)

Modified: stable/9/sys/dev/mfi/mfi_disk.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi_disk.c	Mon Apr  8 23:01:33 2013	(r249289)
+++ stable/9/sys/dev/mfi/mfi_disk.c	Mon Apr  8 23:06:25 2013	(r249290)
@@ -261,7 +261,6 @@ mfi_disk_strategy(struct bio *bio)
 	struct mfi_softc *controller;
 
 	sc = bio->bio_disk->d_drv1;
-	controller = sc->ld_controller;
 
 	if (sc == NULL) {
 		bio->bio_error = EINVAL;
@@ -271,6 +270,7 @@ mfi_disk_strategy(struct bio *bio)
 		return;
 	}
 
+	controller = sc->ld_controller;
 	if (controller->adpreset) {
 		bio->bio_error = EBUSY;
 		return;