[svn-commits] tzafrir: tools/trunk r8508 - /tools/trunk/xpp/perl_modules/Dahdi/Hardware/USB.pm

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Apr 12 15:18:29 2010
New Revision: 8508

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8508
Log:
Also detect USB devices connected on a hub.

Modified:
    tools/trunk/xpp/perl_modules/Dahdi/Hardware/USB.pm

Modified: tools/trunk/xpp/perl_modules/Dahdi/Hardware/USB.pm
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/xpp/perl_modules/Dahdi/Hardware/USB.pm?view=diff&rev=8508&r1=8507&r2=8508
==============================================================================
--- tools/trunk/xpp/perl_modules/Dahdi/Hardware/USB.pm (original)
+++ tools/trunk/xpp/perl_modules/Dahdi/Hardware/USB.pm Mon Apr 12 15:18:29 2010
@@ -95,7 +95,7 @@
 		}
 	} elsif(-f "$transportdir/idVendor" ) {
 		my $transport_link = readlink($transportdir);
-		$transport_link =~ m|/(\d+)-\d+$|;
+		$transport_link =~ m|/(\d+)-[\d.]+$|;
 		$busnum = $1;
 		$devnum = readval("$transportdir/devnum");
 	}
@@ -140,7 +140,7 @@
 
 		# Older kernels, e.g. 2.6.9, don't have the attribute
 		# busnum:
-		m|/(\d+)-\d+$|;
+		m|/(\d+)-[\d.]+$|;
 		my $busnum = $1 || next;
 		my $vendor = _get_attr("$_/idVendor");
 		my $product = _get_attr("$_/idProduct");