svn commit: r248627 - head/sys/dev/mfi

Xin LI delphij at FreeBSD.org
Fri Mar 22 22:46:20 UTC 2013


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;


More information about the svn-src-all mailing list