aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]Documentation/dvb/get_dvb_firmware15
-rw-r--r--drivers/media/video/em28xx/em28xx-dvb.c2
2 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index 224d9e685d5c..c466f5831f15 100644..100755
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -27,7 +27,7 @@ use IO::Handle;
27 "or51211", "or51132_qam", "or51132_vsb", "bluebird", 27 "or51211", "or51132_qam", "or51132_vsb", "bluebird",
28 "opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718", 28 "opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718",
29 "af9015", "ngene", "az6027", "lme2510_lg", "lme2510c_s7395", 29 "af9015", "ngene", "az6027", "lme2510_lg", "lme2510c_s7395",
30 "lme2510c_s7395_old", "drxk"); 30 "lme2510c_s7395_old", "drxk", "drxk_terratec_h5");
31 31
32# Check args 32# Check args
33syntax() if (scalar(@ARGV) != 1); 33syntax() if (scalar(@ARGV) != 1);
@@ -652,6 +652,19 @@ sub drxk {
652 "$fwfile" 652 "$fwfile"
653} 653}
654 654
655sub drxk_terratec_h5 {
656 my $url = "http://www.linuxtv.org/downloads/firmware/";
657 my $hash = "19000dada8e2741162ccc50cc91fa7f1";
658 my $fwfile = "dvb-usb-terratec-h5-drxk.fw";
659
660 checkstandard();
661
662 wgetfile($fwfile, $url . $fwfile);
663 verify($fwfile, $hash);
664
665 "$fwfile"
666}
667
655# --------------------------------------------------------------- 668# ---------------------------------------------------------------
656# Utilities 669# Utilities
657 670
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 9b2be03c82e8..f8617d27ab88 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -305,7 +305,7 @@ struct drxk_config terratec_h5_drxk = {
305 .adr = 0x29, 305 .adr = 0x29,
306 .single_master = 1, 306 .single_master = 1,
307 .no_i2c_bridge = 1, 307 .no_i2c_bridge = 1,
308 .microcode_name = "terratec_h5.fw", 308 .microcode_name = "dvb-usb-terratec-h5-drxk.fw",
309}; 309};
310 310
311static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable) 311static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)