diff --git a/Makefile b/Makefile
index 9876de1..7172939 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 KERNEL_RELEASE = $(shell uname -r)
-KERNEL_BUILDROOT ?= /lib/modules/$(KERNEL_RELEASE)/build
+KERNEL_BUILDROOT ?= /root/linux-2.6.21.5/obj
 BUILDROOT = $(shell pwd)
 
 obj-m       := fpgafs.o
diff --git a/llmgmt.c b/llmgmt.c
index 4096c43..7c5682a 100644
--- a/llmgmt.c
+++ b/llmgmt.c
@@ -15,7 +15,7 @@ static DEFINE_SPINLOCK(fpgafs_lldrv_lock);
 
 int fpgafs_send_data(char *buf, int len)
 {
-	return (lldrv_cur)?lldrv_cur->send(buf, len) : -EBUSY;
+	return (lldrv_cur) ? lldrv_cur->send(buf, len) : -EBUSY;
 }
 EXPORT_SYMBOL_GPL(fpgafs_send_data);
 
@@ -64,14 +64,14 @@ int fpgafs_unregister_lldrv(struct fpgafs_lldrv *drv)
 		if (lldrv[i] == drv) {
 
 			/* call the exit function */
-			if (lldrv[lldrv_count]->exit)
-				lldrv[lldrv_count]->exit();
+			if (lldrv[i]->exit)
+				lldrv[i]->exit();
 
 			lldrv[i] = NULL;
-			lldrv_cur = NULL;
 
 			/* if current, search another low level driver */
 			if (lldrv_cur == drv) {
+				lldrv_cur = NULL;
 				for(k=0; k < FPGAFS_MAX_LLDRV; k++)
 					if (lldrv[k]) {
 						lldrv_cur = lldrv[k];