media: pci: fix several typos (16790554) · Commits · 戴 / test

drivers/media/pci/bt8xx/bttv-audio-hook.c

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Handlers for board audio hooks, splitted from bttv-cards
		* Handlers for board audio hooks, split from bttv-cards
		*
		* Copyright (c) 2006 Mauro Carvalho Chehab <mchehab@kernel.org>
		* This code is placed under the terms of the GNU General Public License

drivers/media/pci/bt8xx/bttv-audio-hook.h

+1 −1

Original line number	Diff line number	Diff line
		/*
		* Handlers for board audio hooks, splitted from bttv-cards
		* Handlers for board audio hooks, split from bttv-cards
		*
		* Copyright (c) 2006 Mauro Carvalho Chehab <mchehab@kernel.org>
		* This code is placed under the terms of the GNU General Public License

drivers/media/pci/bt8xx/bttv-cards.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@

		bttv-cards.c

		this file has configuration informations - card-specific stuff
		this file has configuration information - card-specific stuff
		like the big tvcards array for the most part

		Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de)
		@@ -1391,7 +1391,7 @@ struct tvcard bttv_tvcards[] = {
		.gpiomux = {0x947fff, 0x987fff,0x947fff,0x947fff },
		.gpiomute = 0x947fff,
		/* tvtuner, radio, external,internal, mute, stereo
		* tuner, Composit, SVid, Composit-on-Svid-adapter */
		* tuner, Composite, SVid, Composite-on-Svid-adapter */
		.muxsel = MUXSEL(2, 3, 0, 1),
		.tuner_type = TUNER_MT2032,
		.tuner_addr = ADDR_UNSET,
		@@ -1411,7 +1411,7 @@ struct tvcard bttv_tvcards[] = {
		.gpiomux = {0x947fff, 0x987fff,0x947fff,0x947fff },
		.gpiomute = 0x947fff,
		/* tvtuner, radio, external,internal, mute, stereo
		* tuner, Composit, SVid, Composit-on-Svid-adapter */
		* tuner, Composite, SVid, Composite-on-Svid-adapter */
		.muxsel = MUXSEL(2, 3, 0, 1),
		.tuner_type = TUNER_MT2032,
		.tuner_addr = ADDR_UNSET,
		@@ -4180,7 +4180,7 @@ static void init_PXC200(struct bttv *btv)
		bttv_I2CWrite(btv,0x5E,0,0x80,1);

		/* Initialise 12C508 PIC */
		/* The I2CWrite and I2CRead commmands are actually to the
		/* The I2CWrite and I2CRead commands are actually to the
		* same chips - but the R/W bit is included in the address
		* argument so the numbers are different */

		@@ -4289,7 +4289,7 @@ init_RTV24 (struct bttv *btv)
		/* ----------------------------------------------------------------------- */
		/*
		* The PCI-8604PW contains a CPLD, probably an ispMACH 4A, that filters
		* the PCI REQ signals comming from the four BT878 chips. After power
		* the PCI REQ signals coming from the four BT878 chips. After power
		* up, the CPLD does not forward requests to the bus, which prevents
		* the BT878 from fetching RISC instructions from memory. While the
		* CPLD is connected to most of the GPIOs of PCI device 0xD, only
		@@ -4405,7 +4405,7 @@ static void rv605_muxsel(struct bttv *btv, unsigned int input)

		gpio_bits(0x07f, muxgpio[input]);

		/* reset all conections */
		/* reset all connections */
		gpio_bits(0x200,0x200);
		mdelay(1);
		gpio_bits(0x200,0x000);

drivers/media/pci/bt8xx/bttv-driver.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2435,7 +2435,7 @@ static int bttv_s_fmt_vid_cap(struct file file, void priv,

		f->fmt.pix.field = field;

		/* update our state informations */
		/* update our state information */
		fh->fmt = fmt;
		fh->cap.field = f->fmt.pix.field;
		fh->cap.last = V4L2_FIELD_NONE;
		@@ -3064,7 +3064,7 @@ static int bttv_open(struct file *file)
		V4L2 apps we now reset the cropping parameters as seen through
		this fh, which is to say VIDIOC_G_SELECTION and scaling limit checks
		will use btv->crop[0], the default cropping parameters for the
		current video standard, and VIDIOC_S_FMT will not implicitely
		current video standard, and VIDIOC_S_FMT will not implicitly
		change the cropping parameters until VIDIOC_S_SELECTION has been
		called. */
		fh->do_crop = !reset_crop; /* module parameter */

drivers/media/pci/bt8xx/bttv-risc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ bttv_risc_packed(struct bttv btv, struct btcx_riscmem risc,
		*(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
		offset+=bpl;
		} else {
		/* scanline needs to be splitted */
		/* scanline needs to be split */
		todo = bpl;
		*(rp++)=cpu_to_le32(BT848_RISC_WRITE\|BT848_RISC_SOL\|
		(sg_dma_len(sg)-offset));

Admin message