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

[SVN commits to the Digium repositories]

Author: fjoe
Date: Tue Jun  1 03:44:19 2010
New Revision: 8726

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8726
Log:
dahdi_pci_get_slot() does not add +1.

Modified:
    freebsd/trunk/drivers/dahdi/wcb4xxp/base.c
    freebsd/trunk/drivers/dahdi/wct4xxp/base.c
    freebsd/trunk/drivers/dahdi/wctdm24xxp/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=8726&r1=8725&r2=8726
==============================================================================
--- freebsd/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wcb4xxp/base.c Tue Jun  1 03:44:19 2010
@@ -2434,7 +2434,7 @@
 		bspan->span.manufacturer = "Digium";
 		dahdi_copy_string(bspan->span.devicetype, b4->variety, sizeof(bspan->span.devicetype));
 		sprintf(bspan->span.location, "PCI Bus %02d Slot %02d",
-			dahdi_pci_get_bus(b4->pdev), dahdi_pci_get_slot(b4->pdev));
+			dahdi_pci_get_bus(b4->pdev), dahdi_pci_get_slot(b4->pdev) + 1);
 
 		bspan->span.owner = THIS_MODULE;
 		bspan->span.spanconfig = b4xxp_spanconfig;

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=8726&r1=8725&r2=8726
==============================================================================
--- freebsd/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wct4xxp/base.c Tue Jun  1 03:44:19 2010
@@ -1892,7 +1892,7 @@
 		else
 			snprintf(ts->span.location, sizeof(ts->span.location) - 1,
 				 "PCI%s Bus %02d Slot %02d", (ts->spanflags & FLAG_EXPRESS) ? " Express" : " ",
-				 dahdi_pci_get_bus(wc->dev), dahdi_pci_get_slot(wc->dev));
+				 dahdi_pci_get_bus(wc->dev), dahdi_pci_get_slot(wc->dev) + 1);
 		switch (ts->spantype) {
 		case TYPE_T1:
 			ts->span.spantype = "T1";

Modified: freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=8726&r1=8725&r2=8726
==============================================================================
--- freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wctdm24xxp/base.c Tue Jun  1 03:44:19 2010
@@ -3641,7 +3641,7 @@
 	snprintf(s->span.desc, sizeof(s->span.desc) - 1, "%s Board %d", wc->desc->name, wc->pos + 1);
 	snprintf(s->span.location, sizeof(s->span.location) - 1,
 		 "PCI%s Bus %02d Slot %02d", (wc->flags[0] & FLAG_EXPRESS) ? " Express" : "",
-		 dahdi_pci_get_bus(pdev), dahdi_pci_get_slot(pdev));
+		 dahdi_pci_get_bus(pdev), dahdi_pci_get_slot(pdev) + 1);
 	s->span.manufacturer = "Digium";
 	strncpy(s->span.devicetype, wc->desc->name, sizeof(s->span.devicetype) - 1);