diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-09 22:39:42 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-09 22:39:42 -0200 |
| commit | bd7bb69be657ca3ab2bcb1a327ab33655077aa3b (patch) | |
| tree | e9760d779572d694589127558f9743dd2e713c17 /v4l/scripts/usbvision.pl | |
| parent | d87e760250d55cf7fc00d4c7724d62451ba6609e (diff) | |
| parent | 8e53f8116552eb5c0d207265d210c76040e2dbea (diff) | |
| download | mediapointer-dvb-s2-bd7bb69be657ca3ab2bcb1a327ab33655077aa3b.tar.gz mediapointer-dvb-s2-bd7bb69be657ca3ab2bcb1a327ab33655077aa3b.tar.bz2 | |
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/scripts/usbvision.pl')
| -rwxr-xr-x | v4l/scripts/usbvision.pl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/v4l/scripts/usbvision.pl b/v4l/scripts/usbvision.pl index 3976e8bd1..b31df4f78 100755 --- a/v4l/scripts/usbvision.pl +++ b/v4l/scripts/usbvision.pl @@ -20,13 +20,15 @@ while (<>) { next unless defined($id); - if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*).*driver_info\s*=\s*([\w\d_]+)/) -{ + if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*).*/) + { $subvendor=$1; $subdevice=$2; - push @{$data{$3}->{subid}}, "$subvendor:$subdevice"; } - + if(/driver_info\s*=\s*([\w\d_]+)/) + { + push @{$data{$1}->{subid}}, "$subvendor:$subdevice"; + } if (!defined($data{$id}) || !defined($data{$id}->{name})) { $data{$id}->{name} = $1 if (/\.ModelString\s*=\s*\"([^\"]+)\"/); } |