Commit c9d20af6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (33 commits)
  V4L/DVB (3965): Fix CONFIG_VIDEO_VIVI=y build bug
  V4L/DVB (3964): Bt8xx/bttv-cards.c: fix off-by-one errors
  V4L/DVB (3914): Vivi build fix
  V4L/DVB (3912): Sparc32 vivi fix
  V4L/DVB (3832): Get_dvb_firmware: download nxt2002 firmware from new driver location
  V4L/DVB (3829): Fix frequency values in the ranges structures of the LG TDVS H06xF tuners
  V4L/DVB (3826): Saa7134: Missing 'break' in Terratec Cinergy 400 TV initialization
  V4L/DVB (3825): Remove broken 'fast firmware load' from cx25840.
  V4L/DVB (3819): Cxusb-bluebird: bug-fix: power down corrupts frontend
  V4L/DVB (3813): Add support for TCL M2523_5N_E tuner.
  V4L/DVB (3804): Tweak bandselect setup fox cx24123
  V4L/DVB (3803): Various correctness fixes to tuning.
  V4L/DVB (3797): Always wait for diseqc queue to become ready before transmitting a diseqc message
  V4L/DVB (3796): Add several debug messages to cx24123 code
  V4L/DVB (3795): Fix for CX24123 & low symbol rates
  V4L/DVB (3792): Kbuild: DVB_BT8XX must select DVB_ZL10353
  V4L/DVB (3790): Use after free in drivers/media/video/em28xx/em28xx-video.c
  V4L/DVB (3788): Fix compilation with V4L1_COMPAT
  V4L/DVB (3782): Removed uneeded stuff from pwc Makefile
  V4L/DVB (3775): Add VIVI Kconfig stuff
  ...
parents b307e854 8a2ae70a

Documentation/dvb/get_dvb_firmware

+4 −4
Original line number Diff line number Diff line
@@ -259,9 +259,9 @@ sub dibusb { 
}



sub nxt2002 {

    my $sourcefile = "Broadband4PC_4_2_11.zip";

    my $sourcefile = "Technisat_DVB-PC_4_4_COMPACT.zip";

    my $url = "http://www.bbti.us/download/windows/$sourcefile";

    my $hash = "c6d2ea47a8f456d887ada0cfb718ff2a";

    my $hash = "476befae8c7c1bb9648954060b1eec1f";

    my $outfile = "dvb-fe-nxt2002.fw";

    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
@@ -269,8 +269,8 @@ sub nxt2002 { 


    wgetfile($sourcefile, $url);

    unzip($sourcefile, $tmpdir);

    verify("$tmpdir/SkyNETU.sys", $hash);

    extract("$tmpdir/SkyNETU.sys", 375832, 5908, $outfile);

    verify("$tmpdir/SkyNET.sys", $hash);

    extract("$tmpdir/SkyNET.sys", 331624, 5908, $outfile);



    $outfile;

}

drivers/media/Kconfig

+38 −7
Original line number Diff line number Diff line
@@ -8,22 +8,54 @@ config VIDEO_DEV 
	tristate "Video For Linux"

	---help---

	  Support for audio/video capture and overlay devices and FM radio

	  cards. The exact capabilities of each device vary. User tools for

	  this are available from

	  <ftp://ftp.uk.linux.org/pub/linux/video4linux/>.

	  cards. The exact capabilities of each device vary.



	  This kernel includes support for the new Video for Linux Two API,

	  (V4L2) as well as the original system. Drivers and applications

	  need to be rewritten to use V4L2, but drivers for popular cards

	  and applications for most video capture functions already exist.



	  Documentation for the original API is included in the file

	  <file:Documentation/video4linux/API.html>.  Documentation for V4L2 is

	  available on the web at <http://bytesex.org/v4l/>.

	  Additional info and docs are available on the web at

	  <http://linuxtv.org>



	  Documentation for V4L2 is also available on the web at

	  <http://bytesex.org/v4l/>.



	  To compile this driver as a module, choose M here: the

	  module will be called videodev.



config VIDEO_V4L1

	boolean "Enable Video For Linux API 1 (DEPRECATED)"

	depends on VIDEO_DEV

	select VIDEO_V4L1_COMPAT

	default y

	---help---

	  Enables a compatibility API used by most V4L2 devices to allow

	  its usage with legacy applications that supports only V4L1 api.



	  If you are unsure as to whether this is required, answer Y.



config VIDEO_V4L1_COMPAT

	boolean "Enable Video For Linux API 1 compatible Layer"

	depends on VIDEO_DEV

	default y

	---help---

	  This api were developed to be used at Kernel 2.2 and 2.4, but

	  lacks support for several video standards. There are several

	  drivers at kernel that still depends on it.



	  Documentation for the original API is included in the file

	  <Documentation/video4linux/API.html>.



	  User tools for this are available from

	  <ftp://ftp.uk.linux.org/pub/linux/video4linux/>.



	  If you are unsure as to whether this is required, answer Y.



config VIDEO_V4L2

	tristate

	default y



source "drivers/media/video/Kconfig"



source "drivers/media/radio/Kconfig"
@@ -65,4 +97,3 @@ config USB_DABUSB 
	  module will be called dabusb.



endmenu

drivers/media/common/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config VIDEO_SAA7146 


config VIDEO_SAA7146_VV

	tristate

	select VIDEO_V4L2

	select VIDEO_BUF

	select VIDEO_VIDEOBUF

	select VIDEO_SAA7146

drivers/media/dvb/bt8xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config DVB_BT8XX 
	select DVB_CX24110

	select DVB_OR51211

	select DVB_LGDT330X

	select DVB_ZL10353

	select FW_LOADER

	help

	  Support for PCI cards based on the Bt8xx PCI bridge. Examples are

drivers/media/dvb/cinergyT2/cinergyT2.c

+4 −1
Original line number Diff line number Diff line
@@ -902,7 +902,10 @@ static int cinergyt2_probe (struct usb_interface *intf, 
		return -ENOMEM;

	}



	dvb_register_adapter(&cinergyt2->adapter, DRIVER_NAME, THIS_MODULE);

	if ((err = dvb_register_adapter(&cinergyt2->adapter, DRIVER_NAME, THIS_MODULE)) < 0) {

		kfree(cinergyt2);

		return err;

	}



	cinergyt2->demux.priv = cinergyt2;

	cinergyt2->demux.filternum = 256;

CRA Git | Maintained and supported by SUSTech CRA and CCSE