[svn-commits] rmeyerriecks: linux/trunk r7931 - /linux/trunk/drivers/dahdi/wct4xxp/base.c

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Mon Jan 18 15:00:21 2010
New Revision: 7931

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7931
Log:
wct4xxp: Make sure 2 port cards only use 2 ports

Modified:
    linux/trunk/drivers/dahdi/wct4xxp/base.c

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=7931&r1=7930&r2=7931
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Mon Jan 18 15:00:21 2010
@@ -3995,6 +3995,8 @@
 	spin_lock_init(&wc->reglock);
 	dt = (struct devtype *) (ent->driver_data);
 
+	wc->flags = dt->flags;
+
 	if (wc->flags & FLAG_2PORT) 
 		wc->numspans = 2;
 	else
@@ -4024,8 +4026,6 @@
 	/* Keep track of which device we are */
 	pci_set_drvdata(pdev, wc);
 
-	wc->flags = dt->flags;
-	
 	if (wc->flags & FLAG_5THGEN) {
 		if ((ms_per_irq > 1) && (latency <= ((ms_per_irq) << 1))) {
 			init_latency = ms_per_irq << 1;