diff -u -p /usr/cvs/src/sys/dev/eisa/if_fea.c /tmp/nothing
--- /usr/cvs/src/sys/dev/eisa/if_fea.c	2010-03-23 04:01:39.000000000 +0100
+++ /tmp/nothing
@@ -246,7 +246,7 @@ pdq_eisa_attach(
 
     sc = (pdq_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_WAITOK|M_ZERO);
     if (sc == NULL) {
-	printf("fea%d: malloc failed!\n", sc->sc_if.if_unit);
+	printf("fea%d: malloc failed!\n", ed->unit);
 	return -1;
     }
     pdqs_eisa[ed->unit] = sc;
diff -u -p /usr/cvs/src/sys/dev/ieee1394/firewire.c /tmp/nothing
--- /usr/cvs/src/sys/dev/ieee1394/firewire.c	2010-05-24 05:03:31.000000000 +0200
+++ /tmp/nothing
@@ -907,7 +907,7 @@ fw_xfer_free(struct fw_xfer* xfer)
 {
 
 	if (xfer == NULL) {
-		aprint_error_dev(xfer->fc->bdev, "xfer == NULL\n");
+		aprint_error("%s: xfer == NULL\n", __func__);
 		return;
 	}
 	fw_xfer_unload(xfer);
@@ -920,7 +919,7 @@ fw_xfer_free_buf(struct fw_xfer* xfer)
 {
 
 	if (xfer == NULL) {
-		aprint_error_dev(xfer->fc->bdev, "xfer == NULL\n");
+		aprint_error("%s: xfer == NULL\n", __func__);
 		return;
 	}
 	fw_xfer_unload(xfer);
diff -u -p /usr/cvs/src/sys/external/bsd/drm/dist/shared-core/radeon_cs.c /tmp/nothing
--- /usr/cvs/src/sys/external/bsd/drm/dist/shared-core/radeon_cs.c	2010-05-24 03:39:06.000000000 +0200
+++ /tmp/nothing
@@ -150,7 +150,6 @@ int radeon_cs_ioctl(struct drm_device *d
 
 	if (dev_priv == NULL) {
 		DRM_ERROR("called with no initialization\n");
-		DRM_SPINUNLOCK(&dev_priv->cs.cs_mutex);
 		return -EINVAL;
 	}
 	if (!cs->num_chunks) {
diff -u -p /usr/cvs/src/sys/kern/subr_lockdebug.c /tmp/nothing
--- /usr/cvs/src/sys/kern/subr_lockdebug.c	2009-11-03 01:29:11.000000000 +0100
+++ /tmp/nothing
@@ -320,8 +320,8 @@ lockdebug_free(volatile void *lock)
	ld = lockdebug_lookup(lock, (uintptr_t) __builtin_return_address(0));
 	if (ld == NULL) {
 		__cpu_simple_unlock(&ld_mod_lk);
- 		panic("lockdebug_free: destroying uninitialized object %p"
-		    "(ld_lock=%p)", lock, ld->ld_lock);
+ 		panic("lockdebug_free: destroying uninitialized object %p",
+		    lock);
 		lockdebug_abort1(ld, s, __func__, "record follows", true);
 		return;
 	}
diff -u -p /usr/cvs/src/sys/netinet6/esp_aesctr.c /tmp/nothing
--- /usr/cvs/src/sys/netinet6/esp_aesctr.c	2009-04-18 16:58:05.000000000 +0200
+++ /tmp/nothing
@@ -79,10 +79,9 @@ esp_aesctr_mature(struct secasvar *sav)
 	const struct esp_algorithm *algo;
 
 	algo = esp_algorithm_lookup(sav->alg_enc);
-	if (!algo) {
+	if (algo == NULL) {
 		ipseclog((LOG_ERR,
-		    "esp_aeesctr_mature %s: unsupported algorithm.\n",
-		    algo->name));
+		    "esp_aeesctr_mature: NULL is not a valid algorithm.\n"));
 		return 1;
 	}
 
diff -u -p /usr/cvs/src/sys/netinet6/esp_core.c /tmp/nothing
--- /usr/cvs/src/sys/netinet6/esp_core.c	2009-04-18 16:58:05.000000000 +0200
+++ /tmp/nothing
@@ -404,9 +404,9 @@ esp_cbc_mature(struct secasvar *sav)
 	}
 
 	algo = esp_algorithm_lookup(sav->alg_enc);
-	if (!algo) {
+	if (algo == NULL) {
 		ipseclog((LOG_ERR,
-		    "esp_cbc_mature %s: unsupported algorithm.\n", algo->name));
+		    "esp_cbc_mature: NULL is not a valid algorithm.\n"));
 		return 1;
 	}