From owner-svn-src-all@FreeBSD.ORG Fri Mar 22 22:46:20 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
by hub.freebsd.org (Postfix) with ESMTP id 06FAECC9;
Fri, 22 Mar 2013 22:46:20 +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 EDE072AF;
Fri, 22 Mar 2013 22:46:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2MMkJjw065344;
Fri, 22 Mar 2013 22:46:19 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2MMkJaa065343;
Fri, 22 Mar 2013 22:46:19 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201303222246.r2MMkJaa065343@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 22 Mar 2013 22:46:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r248627 - head/sys/dev/mfi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 22 Mar 2013 22:46:20 -0000
Author: delphij
Date: Fri Mar 22 22:46:19 2013
New Revision: 248627
URL: http://svnweb.freebsd.org/changeset/base/248627
Log:
Don't attempt to reference sc before testing whether it's NULL.
Submitted by: Sascha Wildner
Obtained from: DragonFly
MFC after: 2 weeks
Modified:
head/sys/dev/mfi/mfi_disk.c
Modified: head/sys/dev/mfi/mfi_disk.c
==============================================================================
--- head/sys/dev/mfi/mfi_disk.c Fri Mar 22 22:40:16 2013 (r248626)
+++ head/sys/dev/mfi/mfi_disk.c Fri Mar 22 22:46:19 2013 (r248627)
@@ -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;