Commit 3011c7f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (38 commits)
  V4L/DVB (12441): siano: read buffer overflow
  V4L/DVB (12440): Use kzalloc for frontend states to have struct dvb_frontend properly
  V4L/DVB (12438): Read buffer overflow
  V4L/DVB (12437): dvb: siano uses/depends on INPUT
  V4L/DVB (12436): stk-webcam: read buffer overflow
  V4L/DVB (12432): em28xx: fix regression in Empire DualTV digital tuning
  V4L/DVB (12429): v4l2-ioctl: fix G_STD and G_PARM default handlers
  V4L/DVB (12428): hdpvr: add missing initialization of current_norm
  V4L/DVB (12424): soc-camera: fix recursive locking in .buf_queue()
  V4L/DVB (12422): media/zr364xx: fix build errors
  V4L/DVB (12405): em28xx-cards: move register 0x13 setting to the proper place
  V4L/DVB (12411): em28xx: Fix artifacts with Silvercrest webcam
  V4L/DVB (12410): em28xx: Move the non-board dependent part to be outside em28xx_pre_card_setup()
  V4L/DVB (12407): em28xx: Adjust Silvercrest xtal frequency
  V4L/DVB (12406): em28xx: fix: don't do image interlacing on webcams
  V4L/DVB (12403): em28xx: properly reports some em2710 chips
  V4L/DVB (12402): em28xx: fix: some em2710 chips use a different vendor ID
  V4L/DVB (12401): m9v011: add vflip/hflip controls to control mirror/upside down
  V4L/DVB (12400): em28xx: Allow changing fps on webcams
  V4L/DVB (12399): mt9v011: Add support for controlling frame rates
  ...
parents 64f1607f 08b39642

Documentation/video4linux/CARDLIST.em28xx

+1 −1
Original line number Diff line number Diff line 
  0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]

  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]

  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]

  2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]

  3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]

  4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]

Documentation/video4linux/CARDLIST.saa7134

+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ 
152 -> Asus Tiger Rev:1.00                      [1043:4857]

153 -> Kworld Plus TV Analog Lite PCI           [17de:7128]

154 -> Avermedia AVerTV GO 007 FM Plus          [1461:f31d]

155 -> Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid  [0070:6706,0070:6708]

156 -> Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid   [0070:6707,0070:6709,0070:670a]

155 -> Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid  [0070:6706,0070:6708]

156 -> Hauppauge WinTV-HVR1120 DVB-T/Hybrid     [0070:6707,0070:6709,0070:670a]

157 -> Avermedia AVerTV Studio 507UA            [1461:a11b]

158 -> AVerMedia Cardbus TV/Radio (E501R)       [1461:b7e9]

159 -> Beholder BeholdTV 505 RDS                [0000:505B]

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -2238,6 +2238,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git 
S:	Maintained

F:	drivers/media/video/gspca/pac207.c



GSPCA SN9C20X SUBDRIVER

P:	Brian Johnson

M:	brijohn@gmail.com

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

S:	Maintained

F:	drivers/media/video/gspca/sn9c20x.c



GSPCA T613 SUBDRIVER

M:	Leandro Costantino <lcostantino@gmail.com>

L:	linux-media@vger.kernel.org

drivers/media/common/tuners/qt1010.c

+5 −7
Original line number Diff line number Diff line
@@ -64,24 +64,22 @@ static int qt1010_writereg(struct qt1010_priv *priv, u8 reg, u8 val) 
/* dump all registers */

static void qt1010_dump_regs(struct qt1010_priv *priv)

{

	char buf[52], buf2[4];

	u8 reg, val;



	for (reg = 0; ; reg++) {

		if (reg % 16 == 0) {

			if (reg)

				printk("%s\n", buf);

			sprintf(buf, "%02x: ", reg);

				printk(KERN_CONT "\n");

			printk(KERN_DEBUG "%02x:", reg);

		}

		if (qt1010_readreg(priv, reg, &val) == 0)

			sprintf(buf2, "%02x ", val);

			printk(KERN_CONT " %02x", val);

		else

			strcpy(buf2, "-- ");

		strcat(buf, buf2);

			printk(KERN_CONT " --");

		if (reg == 0x2f)

			break;

	}

	printk("%s\n", buf);

	printk(KERN_CONT "\n");

}



static int qt1010_set_params(struct dvb_frontend *fe,

drivers/media/common/tuners/tuner-xc2028.c

+2 −2
Original line number Diff line number Diff line
@@ -1119,8 +1119,8 @@ static int xc2028_sleep(struct dvb_frontend *fe) 
	struct xc2028_data *priv = fe->tuner_priv;

	int rc = 0;



	/* Avoid firmware reload on slow devices */

	if (no_poweroff)

	/* Avoid firmware reload on slow devices or if PM disabled */

	if (no_poweroff || priv->ctrl.disable_power_mgmt)

		return 0;



	tuner_dbg("Putting xc2028/3028 into poweroff mode.\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE