[svn-commits] fjoe: freebsd/trunk r8289 - in /freebsd/trunk/drivers/dahdi: wcb4xxp/ wct4xxp/

[SVN commits to the Digium repositories]

Author: fjoe
Date: Mon Mar  8 13:41:37 2010
New Revision: 8289

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8289
Log:
- Do not call bus_deactivate_resource 
- Destroy spinlocks 

Modified:
    freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
    freebsd/trunk/drivers/dahdi/wct4xxp/base.c

Modified: freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=8289&r1=8288&r2=8289
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wcb4xxp/base.c Mon Mar  8 13:41:37 2010
@@ -2980,14 +2980,12 @@
 
 	/* release I/O range */
 	if (b4->io_res != NULL) {
-		bus_deactivate_resource(b4->pdev->dev, SYS_RES_IOPORT, b4->io_rid, b4->mem_res);
 		bus_release_resource(b4->pdev->dev, SYS_RES_IOPORT, b4->io_rid, b4->io_res);
 		b4->io_res = NULL;
 	}
 
 	/* release memory window */
 	if (b4->mem_res != NULL) {
-		bus_deactivate_resource(b4->pdev->dev, SYS_RES_MEMORY, b4->mem_rid, b4->mem_res);
 		bus_release_resource(b4->pdev->dev, SYS_RES_MEMORY, b4->mem_rid, b4->mem_res);
 		b4->mem_res = NULL;
 	}

Modified: freebsd/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=8289&r1=8288&r2=8289
==============================================================================
--- freebsd/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wct4xxp/base.c Mon Mar  8 13:41:37 2010
@@ -4539,6 +4539,7 @@
 		destroy_workqueue(wc->workq);
 	}
 #endif			
+	spin_lock_destroy(&wc->reglock);
 }
 
 
@@ -4591,7 +4592,6 @@
 
 	/* release memory window */
 	if (wc->mem_res != NULL) {
-		bus_deactivate_resource(wc->dev->dev, SYS_RES_MEMORY, wc->mem_rid, wc->mem_res);
 		bus_release_resource(wc->dev->dev, SYS_RES_MEMORY, wc->mem_rid, wc->mem_res);
 		wc->mem_res = NULL;
 	}