diff --git a/src/add-ons/kernel/drivers/misc/config.c b/src/add-ons/kernel/drivers/misc/config.c
index c66e12e306..461cd8f372 100644
--- a/src/add-ons/kernel/drivers/misc/config.c
+++ b/src/add-ons/kernel/drivers/misc/config.c
@@ -159,7 +159,6 @@ init_driver()
 void
 uninit_driver()
 {
-	if (gConfigManager != NULL)
-		put_module(B_CONFIG_MANAGER_FOR_DRIVER_MODULE_NAME);
+	put_module(B_CONFIG_MANAGER_FOR_DRIVER_MODULE_NAME);
 }
 
diff --git a/src/add-ons/kernel/drivers/misc/poke.c b/src/add-ons/kernel/drivers/misc/poke.c
index 4b4a24979f..700cc8470b 100644
--- a/src/add-ons/kernel/drivers/misc/poke.c
+++ b/src/add-ons/kernel/drivers/misc/poke.c
@@ -31,8 +31,8 @@ static const char* poke_name[] = {
 
 device_hooks poke_hooks = {
 	poke_open,
-    poke_close,
-    poke_free,
+	poke_close,
+	poke_free,
 	poke_control,
 	poke_read,
 	poke_write,
@@ -51,14 +51,14 @@ static uint32 open_count;
 status_t
 init_hardware(void)
 {
-    return B_OK;
+	return B_OK;
 }
 
 
 status_t
 init_driver(void)
 {
-    open_count = 0;
+	open_count = 0;
 
 	if (get_module(B_ISA_MODULE_NAME, (module_info**)&isa) < B_OK)
 		return ENOSYS;
@@ -68,7 +68,7 @@ init_driver(void)
 		return ENOSYS;
 	}
 
-    return B_OK;
+	return B_OK;
 }
 
 
@@ -83,7 +83,7 @@ uninit_driver(void)
 const char**
 publish_devices(void)
 {
-    return poke_name;
+	return poke_name;
 }
 
 
@@ -101,29 +101,29 @@ find_device(const char* name)
 status_t
 poke_open(const char* name, uint32 flags, void** cookie)
 {
-    *cookie = NULL;
+	*cookie = NULL;
 
-    if (atomic_add(&open_count, 1) != 0) {
-        atomic_add(&open_count, -1);
-        return B_BUSY;
-    }
+	if (atomic_add(&open_count, 1) != 0) {
+		atomic_add(&open_count, -1);
+		return B_BUSY;
+	}
 
-    return B_OK;
+	return B_OK;
 }
 
 
 status_t
 poke_close(void* cookie)
 {
-    return B_OK;
+	return B_OK;
 }
 
 
 status_t
 poke_free(void* cookie)
 {
-    atomic_add(&open_count, -1);
-    return B_OK;
+	atomic_add(&open_count, -1);
+	return B_OK;
 }
 
 
diff --git a/src/add-ons/kernel/drivers/misc/test.c b/src/add-ons/kernel/drivers/misc/test.c
old mode 100755
new mode 100644