diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 090087b7112d..dc9ea96d0491 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -372,8 +372,11 @@ ccd_modevent(module_t mod, int type, void *data)
 		error = EOPNOTSUPP;
 		break;
 
-	default:	/* MOD_SHUTDOWN etc */
+	case MOD_SHUTDOWN:
 		break;
+
+	default:
+		error = EOPNOTSUPP;
 	}
 	return (error);
 }
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 090087b7112d..dc9ea96d0491 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -372,8 +372,11 @@ ccd_modevent(module_t mod, int type, void *data)
 		error = EOPNOTSUPP;
 		break;
 
-	default:	/* MOD_SHUTDOWN etc */
+	case MOD_SHUTDOWN:
 		break;
+
+	default:
+		error = EOPNOTSUPP;
 	}
 	return (error);
 }