From ae7ec47b870bb8683ad4539ea860bfc2a6c24635 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Mon, 12 Apr 2010 20:18:29 +0000 Subject: Also detect USB devices connected on a hub. git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@8508 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- xpp/perl_modules/Dahdi/Hardware/USB.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xpp/perl_modules/Dahdi/Hardware/USB.pm b/xpp/perl_modules/Dahdi/Hardware/USB.pm index 711f977..d73bdbe 100644 --- a/xpp/perl_modules/Dahdi/Hardware/USB.pm +++ b/xpp/perl_modules/Dahdi/Hardware/USB.pm @@ -95,7 +95,7 @@ sub set_transport($$) { } } 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 @@ sub scan_devices_sysfs($) { # 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"); -- cgit v1.2.3