do not use tree branches for vendor when there's only one device

1 files changed, 43 insertions, 42 deletions

diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index 68039cff0..7fdf9dc63 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -88,27 +88,27 @@ my $cards_lst = {
         "S|STB|Hauppauge 878" => 3,
         "I|Intel|Create and Share PCI (bttv type 4)" => 4,
         "I|Intel|Smart Video Recorder III (bttv type 4)" => 4,
-        "D|Diamond|DTV2000" => 5,
+        "D|Diamond DTV2000" => 5,
         "A|AVerMedia|TVPhone" => 6,
-        "M|MATRIX-Vision|MV-Delta" => 7,
+        "M|MATRIX Vision|MV-Delta" => 7,
         "L|Lifeview|FlyVideo II (Bt848) LR26" => 8,
         "G|Guillemot|MAXI TV Video PCI2 LR26" => 27,
-        "G|Genius/Kye|Video Wonder Pro II (848 or 878)" => 8,
-        "I|IMS/IXmicro|TurboTV" => 9,
+        "G|Genius/Kye Video Wonder Pro II (848 or 878)" => 8,
+        "I|IMS/IXmicro TurboTV" => 9,
         "H|Hauppauge|bt878" => 10,
         "M|Miro|PCTV pro" => 11,
         "A|ADS Technologies|Channel Surfer TV (bt848)" => 12,
         "A|AVerMedia|TVCapture 98" => 13,
         "A|Aimslab|Video Highway Xtreme (VHX)" => 14,
-        "Z|Zoltrix|TV-Max" => 15,
+        "Zoltrix|TV-Max" => 15,
         "P|Prolink|Pixelview PlayTV (bt878)" => 16,
         "L|Leadtek|WinView 601" => 17,
         "A|AVEC|Intercapture" => 18,
         "L|Lifeview|FlyKit LR38 Bt848 (capture only)" => 19,
         "L|Lifeview|FlyVideo II EZ" => 19,
-        "C|CEI|Raffles Card" => 20,
+        "C|CEI Raffles Card" => 20,
         "L|Lifeview|FlyVideo 98" => 21,
-        "L|Lucky Star|Image World ConferenceTV LR50" => 21,
+        "L|Lucky Star Image World ConferenceTV LR50" => 21,
         "A|Askey|CPH050" => 22,
         "P|Phoebe Micro|Tv Master + FM" => 22,
         "M|Modular|Technology MM205 PCTV (bt878)" => 23,
@@ -124,7 +124,7 @@ my $cards_lst = {
         "L|Lifeview|FlyVideo 98" => 27,
         "G|Guillemot|MAXI TV Video PCI2 LR50" => 27,
         "T|Terratec|TerraTV+" => 28,
-        "I|Imagenation|PXC200" => 29,
+        "I|Imagenation PXC200" => 29,
         "L|Lifeview|FlyVideo 98 LR50" => 30,
         "Formac|iProTV" => 31,
         "Formac|iProTV I (bt848)" => 31,
@@ -134,7 +134,7 @@ my $cards_lst = {
         "L|Leadtek|WinFast TV 2000" => 34,
         "L|Leadtek|WinFast VC 100" => 35,
         "L|Lifeview|FlyVideo 98 LR50" => 35,
-        "C|Chronos|Video Shuttle II" => 35,
+        "C|Chronos Video Shuttle II" => 35,
         "L|Lifeview|FlyVideo 98FM LR50" => 36,
         "T|Typhoon|TView TV/FM Tuner" => 36,
         "P|Prolink|PixelView PlayTV pro" => 37,
@@ -144,19 +144,19 @@ my $cards_lst = {
         "S|STB|STB2 TV PCI FM, P/N 6000704" => 40,
         "A|AVerMedia|TVPhone 98" => 41,
         "P|ProVideo|PV951" => 42,
-        "L|Little|OnAir TV" => 43,
-        "S|Sigma|TVII-FM" => 44,
-        "M|MATRIX-Vision|MV-Delta 2" => 45,
-        "Z|Zoltrix|Genie TV/FM" => 46,
+        "L|Little OnAir TV" => 43,
+        "S|Sigma TVII-FM" => 44,
+        "M|MATRIX Vision|MV-Delta 2" => 45,
+        "Zoltrix|Genie TV/FM" => 46,
         "T|Terratec|TV/Radio+" => 47,
         "A|Askey|CPH03x" => 48,
-        "D|Dynalink|Magic TView" => 48,
+        "D|Dynalink Magic TView" => 48,
         "I|IODATA|GV-BCTV3/PCI" => 49,
         "P|Prolink|PixelView PlayTV PAK" => 50,
         "L|Lenco|MXTV-9578 CP" => 50,
         "P|Prolink|PV-BT878P+4E" => 50,
         "L|Lenco|MXTV-9578CP (Bt878)" => 50,
-        "E|Eagle|Wireless Capricorn2 (bt878A)" => 51,
+        "E|Eagle Wireless Capricorn2 (bt878A)" => 51,
         "P|Pinnacle|PCTV Studio Pro" => 52,
         "T|Typhoon|KNC1 TV Station RDS" => 53,
         "T|Typhoon|TV Tuner RDS (black package)" => 53,
@@ -177,7 +177,7 @@ my $cards_lst = {
         "A|Askey|CPH061" => 62,
         "Bestbuy|Easy TV (bt878)" => 62,
         "L|Lifetec|LT9306" => 62,
-        "M|Medion|MD9306" => 62,
+        "M|Medion MD9306" => 62,
         "A|ATI|TV-Wonder" => 63,
         "A|ATI|TV-Wonder VE" => 64,
         "L|Lifeview|FlyVideo 2000S LR90" => 65,
@@ -191,16 +191,16 @@ my $cards_lst = {
 #    "G|Genius/Kye|Video Wonder/Genius Internet Video Kit" => 71,
         "P|Prolink|Pixelview PV-BT878P+ (Rev.9B) (PlayTV Pro rev.9B FM+NICAM)" => 72,
         "T|Typhoon|TV Tuner Pal BG (blue package)" => 72,
-        "S|Sensoray|311" => 73,
+        "S|Sensoray 311" => 73,
         "RemoteVision|MX (RV605)" => 74,
         "P|Powercolor|MTV878" => 75,
         "P|Powercolor|MTV878R" => 75,
         "P|Powercolor|MTV878F" => 75,
-        "C|Canopus|WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)" => 76,
+        "C|Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)" => 76,
         "G|GrandTec|Multi Capture Card (Bt878)" => 77,
         "Jetway|TV/Capture JW-TV878-FBK" => 78,
-        "Kworld|KW-TV878RF" => 78,
-        "D|DSP Design|TCVIDEO" => 79,
+        "K|Kworld KW-TV878RF" => 78,
+        "D|DSP Design TCVIDEO" => 79,
         "H|Hauppauge|WinTV PVR" => 80,
         "G|GV-BCTV5/PCI" => 81,
         "O|Osprey|100/150 (878)" => 82,
@@ -214,34 +214,34 @@ my $cards_lst = {
         "O|Osprey|500" => 90,
         "O|Osprey|540" => 91,
         "O|Osprey|2000" => 92,
-        "I|IDS|Eagle" => 93,
+        "I|IDS Eagle" => 93,
         "P|Pinnacle|PCTV Sat" => 94,
         "Formac|ProTV II (bt878)" => 95,
         "M|MachTV" => 96,
         "E|Euresys|Picolo" => 97,
         "P|ProVideo|PV150" => 98,
         "A|AD-TVK503" => 99,
-        "H|Hercules|Smart TV Stereo" => 100,
-        "P|Pace|TV & Radio Card" => 101,
-        "I|IVC-200" => 102,
+        "H|Hercules Smart TV Stereo" => 100,
+        "P|Pace TV & Radio Card" => 101,
+        "I|IVC|200" => 102,
         "G|Grand X-Guard / Trust 814PCI" => 103,
-        "N|Nebula Electronics|DigiTV" => 104,
+        "N|Nebula Electronics DigiTV" => 104,
         "P|ProVideo|PV143" => 105,
         "P|PHYTEC|VD-009-X1 MiniDIN (bt878)" => 106,
         "P|PHYTEC|VD-009-X1 Combi (bt878)" => 107,
         "P|PHYTEC|VD-009 MiniDIN (bt878)" => 108,
         "P|PHYTEC|VD-009 Combi (bt878)" => 109,
-        "I|IVC-100" => 110,
-        "I|IVC-120G" => 111,
+        "I|IVC|100" => 110,
+        "I|IVC|120G" => 111,
         "P|pcHDTV HD-2000 TV" => 112,
         "T|Twinhan DST + clones" => 113,
         "L|Leadtek|Winfast VC100" => 114,
-        "T|Teppro|TEV-560/InterVision IV-560" => 115,
-        "S|SIMUS|GVC1100" => 116,
-        "N|NGS|NGSTV+" => 117,
+        "T|Teppro TEV-560/InterVision IV-560" => 115,
+        "S|SIMUS GVC1100" => 116,
+        "N|NGS NGSTV+" => 117,
         "L|LMLBT4" => 118,
-        "T|Tekram|M205 PRO" => 119,
-        "C|Conceptronic|CONTVFMi" => 120,
+        "T|Tekram M205 PRO" => 119,
+        "C|Conceptronic CONTVFMi" => 120,
         "E|Euresys|Picolo Tetra" => 121,
         "S|Spirit TV Tuner" => 122,
         "A|AverMedia|AVerTV DVB-T 771" => 123,
@@ -256,16 +256,17 @@ my $cards_lst = {
         "K|Kodicom|4400R (master)" => 132,
         "K|Kodicom|4400R (slave)" => 133,
         "A|Adlink|RTV24" => 134,
+
     },
     'saa7134' => {
         N("Unknown|Generic") => 0,
-        "Proteus|Pro [philips reference design]" => 1,
+        "Proteus Pro [philips reference design]" => 1,
         "LifeView|FlyVIDEO3000" => 2,
         "LifeView|FlyVIDEO2000" => 3,
         "EMPRESS" => 4,
-        "SKNet|Monster TV" => 5,
-        "Tevion|MD 9717" => 6,
-        "KNC|One TV-Station RDS" => 7,
+        "SKNet Monster TV" => 5,
+        "Tevion MD 9717" => 6,
+        "KNC One TV-Station RDS" => 7,
         "Terratec|Cinergy 400 TV" => 8,
         "Medion|5044" => 9,
         "Kworld/KuroutoShikou SAA7130-TVPCI" => 10,
@@ -274,15 +275,15 @@ my $cards_lst = {
         "ELSA|EX-VISION 300TV" => 13,
         "ELSA|EX-VISION 500TV" => 14,
         "ASUS|TV-FM 7134" => 15,
-        "AOPEN|VA1000 POWER" => 16,
+        "AOPEN VA1000 POWER" => 16,
         "10MOONS PCI TV CAPTURE CARD" => 17,
         "BMK|MPEX No Tuner" => 18,
-        "Compro VideoMate TV" => 19,
-        "Matrox|CronosPlus" => 20,
+        "Compro|VideoMate TV" => 19,
+        "Matrox CronosPlus" => 20,
         "Medion|2819" => 21,
         "BMK|MPEX Tuner" => 22,
         "Medion|2819 / AverMedia M156" => 23,
-        "AVerMedia|M156" => 23,
+        "AverMedia|M156" => 23,
         "BMK|MPEX Tuner alternative" => 24,
         "ASUS|TV-FM 7133" => 25,
         "Pinnacle|PCTV Stereo (saa7134)" => 26,
@@ -291,8 +292,8 @@ my $cards_lst = {
         "Nagase Sangyo TransGear 3000TV" => 29,
         "Elitegroup|ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)" => 30,
         "Elitegroup|ECS TVP3XP FM1236 Tuner Card (NTSC,FM)" => 31,
-        "AVACS|SmartTV" => 32,
-        "AVerMedia|DVD EZMaker" => 33,
+        "AVACS SmartTV" => 32,
+        "AverMedia|DVD EZMaker" => 33,
         "Noval Prime TV 7133" => 34,
         "AverMedia|AverTV Studio 305" => 35,
         "Items MuchTV Plus / IT-005" => 37,