Merge tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

b99dc742 · Linus Torvalds <[email protected]> · 2018-05-04 05:38:51 -10:00

Pull media fixes from Mauro Carvalho Chehab:

 - a trivial one-line fix addressing a PTR_ERR() getting value from a
   wrong var at imx driver

 - a patch changing my e-mail at the Kernel tree to [email protected].
   no code changes

* tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  MAINTAINERS & files: Canonize the e-mails I use at files
  media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR

Commit: b99dc74253980287c826b8158327fc8f2ff03dad
Parents: dac1acc3 · 32590819

Merge commit. Changes below are compared with the first parent: dac1acc3.

Changes

75 files changed · +93 −110

File	Status	Add	Del	Content
Documentation/doc-guide/parse-headers.rst	modified	+2	−2	View file
Documentation/media/uapi/rc/keytable.c.rst	modified	+1	−1	View file
Documentation/media/uapi/v4l/v4l2grab.c.rst	modified	+1	−1	View file
Documentation/sphinx/parse-headers.pl	modified	+2	−2	View file
Documentation/translations/zh_CN/video4linux/v4l2-framework.txt	modified	+2	−2	View file
MAINTAINERS	modified	+0	−17	View file
drivers/media/i2c/saa7115.c	modified	+1	−1	View file
drivers/media/i2c/saa711x_regs.h	modified	+1	−1	View file
drivers/media/i2c/tda7432.c	modified	+1	−1	View file
drivers/media/i2c/tvp5150.c	modified	+1	−1	View file
drivers/media/i2c/tvp5150_reg.h	modified	+1	−1	View file
drivers/media/i2c/tvp7002.c	modified	+1	−1	View file
drivers/media/i2c/tvp7002_reg.h	modified	+1	−1	View file
drivers/media/media-devnode.c	modified	+1	−1	View file
drivers/media/pci/bt8xx/bttv-audio-hook.c	modified	+1	−1	View file
drivers/media/pci/bt8xx/bttv-audio-hook.h	modified	+1	−1	View file
drivers/media/pci/bt8xx/bttv-cards.c	modified	+2	−2	View file
drivers/media/pci/bt8xx/bttv-driver.c	modified	+1	−1	View file
drivers/media/pci/bt8xx/bttv-i2c.c	modified	+1	−1	View file
drivers/media/pci/cx23885/cx23885-input.c	modified	+1	−1	View file
drivers/media/pci/cx88/cx88-alsa.c	modified	+2	−2	View file
drivers/media/pci/cx88/cx88-blackbird.c	modified	+1	−1	View file
drivers/media/pci/cx88/cx88-core.c	modified	+1	−1	View file
drivers/media/pci/cx88/cx88-i2c.c	modified	+1	−1	View file
drivers/media/pci/cx88/cx88-video.c	modified	+1	−1	View file
drivers/media/radio/radio-aimslab.c	modified	+1	−1	View file
drivers/media/radio/radio-aztech.c	modified	+1	−1	View file
drivers/media/radio/radio-gemtek.c	modified	+1	−1	View file
drivers/media/radio/radio-maxiradio.c	modified	+1	−1	View file
drivers/media/radio/radio-rtrack2.c	modified	+1	−1	View file
drivers/media/radio/radio-sf16fmi.c	modified	+1	−1	View file
drivers/media/radio/radio-terratec.c	modified	+1	−1	View file
drivers/media/radio/radio-trust.c	modified	+1	−1	View file
drivers/media/radio/radio-typhoon.c	modified	+1	−1	View file
drivers/media/radio/radio-zoltrix.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-avermedia-m135a.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-encore-enltv-fm53.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-encore-enltv2.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-kaiomy.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-pixelview-new.c	modified	+1	−1	View file
drivers/media/tuners/tea5761.c	modified	+2	−2	View file
drivers/media/tuners/tea5767.c	modified	+2	−2	View file
drivers/media/tuners/tuner-xc2028-types.h	modified	+1	−1	View file
drivers/media/tuners/tuner-xc2028.c	modified	+2	−2	View file
drivers/media/tuners/tuner-xc2028.h	modified	+1	−1	View file
drivers/media/usb/em28xx/em28xx-camera.c	modified	+1	−1	View file
drivers/media/usb/em28xx/em28xx-cards.c	modified	+1	−1	View file
drivers/media/usb/em28xx/em28xx-core.c	modified	+2	−2	View file
drivers/media/usb/em28xx/em28xx-dvb.c	modified	+2	−2	View file
drivers/media/usb/em28xx/em28xx-i2c.c	modified	+1	−1	View file
drivers/media/usb/em28xx/em28xx-input.c	modified	+1	−1	View file
drivers/media/usb/em28xx/em28xx-video.c	modified	+2	−2	View file
drivers/media/usb/em28xx/em28xx.h	modified	+1	−1	View file
drivers/media/usb/gspca/zc3xx-reg.h	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-cards.c	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-core.c	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-i2c.c	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-regs.h	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-usb-isoc.h	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000-video.c	modified	+1	−1	View file
drivers/media/usb/tm6000/tm6000.h	modified	+1	−1	View file
drivers/media/v4l2-core/v4l2-dev.c	modified	+2	−2	View file
drivers/media/v4l2-core/v4l2-ioctl.c	modified	+1	−1	View file
drivers/media/v4l2-core/videobuf-core.c	modified	+3	−3	View file
drivers/media/v4l2-core/videobuf-dma-contig.c	modified	+1	−1	View file
drivers/media/v4l2-core/videobuf-dma-sg.c	modified	+3	−3	View file
drivers/media/v4l2-core/videobuf-vmalloc.c	modified	+2	−2	View file
drivers/staging/media/imx/imx-media-csi.c	modified	+1	−1	View file
include/media/i2c/tvp7002.h	modified	+1	−1	View file
include/media/videobuf-core.h	modified	+2	−2	View file
include/media/videobuf-dma-sg.h	modified	+2	−2	View file
include/media/videobuf-vmalloc.h	modified	+1	−1	View file
scripts/extract_xc3028.pl	modified	+1	−1	View file
scripts/split-man.pl	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/doc-guide/parse-headers.rst

View file

diff --git a/Documentation/doc-guide/parse-headers.rst b/Documentation/doc-guide/parse-headers.rst
index 96a0423..82a3e43 100644
--- a/Documentation/doc-guide/parse-headers.rst
+++ b/Documentation/doc-guide/parse-headers.rst
@@ -177,14 +177,14 @@ BUGS
 ****
 
 
-Report bugs to Mauro Carvalho Chehab <[email protected]>
+Report bugs to Mauro Carvalho Chehab <[email protected]>
 
 
 COPYRIGHT
 *********
 
 
-Copyright (c) 2016 by Mauro Carvalho Chehab <[email protected]>.
+Copyright (c) 2016 by Mauro Carvalho Chehab <[email protected]>.
 
 License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.
 

Documentation/media/uapi/rc/keytable.c.rst

View file

diff --git a/Documentation/media/uapi/rc/keytable.c.rst b/Documentation/media/uapi/rc/keytable.c.rst
index e6ce1e3..217237f 100644
--- a/Documentation/media/uapi/rc/keytable.c.rst
+++ b/Documentation/media/uapi/rc/keytable.c.rst
@@ -7,7 +7,7 @@ file: uapi/v4l/keytable.c
 
     /* keytable.c - This program allows checking/replacing keys at IR
 
-       Copyright (C) 2006-2009 Mauro Carvalho Chehab <[email protected]>
+       Copyright (C) 2006-2009 Mauro Carvalho Chehab <[email protected]>
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by

Documentation/media/uapi/v4l/v4l2grab.c.rst

View file

diff --git a/Documentation/media/uapi/v4l/v4l2grab.c.rst b/Documentation/media/uapi/v4l/v4l2grab.c.rst
index 5aabd0b..f0d0ab6 100644
--- a/Documentation/media/uapi/v4l/v4l2grab.c.rst
+++ b/Documentation/media/uapi/v4l/v4l2grab.c.rst
@@ -6,7 +6,7 @@ file: media/v4l/v4l2grab.c
 .. code-block:: c
 
     /* V4L2 video picture grabber
-       Copyright (C) 2009 Mauro Carvalho Chehab <[email protected]>
+       Copyright (C) 2009 Mauro Carvalho Chehab <[email protected]>
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by

Documentation/sphinx/parse-headers.pl

View file

diff --git a/Documentation/sphinx/parse-headers.pl b/Documentation/sphinx/parse-headers.pl
index a958d8b..d410f47 100755
--- a/Documentation/sphinx/parse-headers.pl
+++ b/Documentation/sphinx/parse-headers.pl
@@ -387,11 +387,11 @@ tree for more details.
 
 =head1 BUGS
 
-Report bugs to Mauro Carvalho Chehab <[email protected]>
+Report bugs to Mauro Carvalho Chehab <[email protected]>
 
 =head1 COPYRIGHT
 
-Copyright (c) 2016 by Mauro Carvalho Chehab <[email protected]>.
+Copyright (c) 2016 by Mauro Carvalho Chehab <[email protected]>.
 
 License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.
 

Documentation/translations/zh_CN/video4linux/v4l2-framework.txt

View file

diff --git a/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
index 698660b..c77c0f0 100644
--- a/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
+++ b/Documentation/translations/zh_CN/video4linux/v4l2-framework.txt
@@ -6,7 +6,7 @@ communicating in English you can also ask the Chinese maintainer for
 help.  Contact the Chinese maintainer if this translation is outdated
 or if there is a problem with the translation.
 
-Maintainer: Mauro Carvalho Chehab <[email protected]>
+Maintainer: Mauro Carvalho Chehab <[email protected]>
 Chinese maintainer: Fu Wei <[email protected]>
 ---------------------------------------------------------------------
 Documentation/video4linux/v4l2-framework.txt 的中文翻译
@@ -14,7 +14,7 @@ Documentation/video4linux/v4l2-framework.txt 的中文翻译
 如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
 交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
 译存在问题，请联系中文版维护者。
-英文版维护者： Mauro Carvalho Chehab <[email protected]>
+英文版维护者： Mauro Carvalho Chehab <[email protected]>
 中文版维护者： 傅炜 Fu Wei <[email protected]>
 中文版翻译者： 傅炜 Fu Wei <[email protected]>
 中文版校译者： 傅炜 Fu Wei <[email protected]>

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index b1ccabd..dc59769 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2554,7 +2554,6 @@ F:	Documentation/devicetree/bindings/sound/axentia,*
 F:	sound/soc/atmel/tse850-pcm5142.c
 
 AZ6007 DVB DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -3083,7 +3082,6 @@ F:	include/linux/btrfs*
 F:	include/uapi/linux/btrfs*
 
 BTTV VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -3812,7 +3810,6 @@ S:	Maintained
 F:	drivers/media/dvb-frontends/cx24120*
 
 CX88 VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -5053,7 +5050,6 @@ F:	drivers/edac/thunderx_edac*
 
 EDAC-CORE
 M:	Borislav Petkov <[email protected]>
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
@@ -5082,7 +5078,6 @@ S:	Maintained
 F:	drivers/edac/fsl_ddr_edac.*
 
 EDAC-GHES
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
@@ -5099,21 +5094,18 @@ S:	Maintained
 F:	drivers/edac/i5000_edac.c
 
 EDAC-I5400
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/edac/i5400_edac.c
 
 EDAC-I7300
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/edac/i7300_edac.c
 
 EDAC-I7CORE
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
@@ -5163,7 +5155,6 @@ S:	Maintained
 F:	drivers/edac/r82600_edac.c
 
 EDAC-SBRIDGE
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 S:	Maintained
@@ -5222,7 +5213,6 @@ S:	Maintained
 F:	drivers/net/ethernet/ibm/ehea/
 
 EM28XX VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -8871,7 +8861,6 @@ F:	Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
 F:	drivers/staging/media/tegra-vde/
 
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 P:	LinuxTV.org Project
 L:	[email protected]
@@ -12260,7 +12249,6 @@ S:	Odd Fixes
 F:	drivers/media/i2c/saa6588*
 
 SAA7134 VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -12765,7 +12753,6 @@ S:	Maintained
 F:	drivers/media/radio/si4713/radio-usb-si4713.c
 
 SIANO DVB DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -13756,7 +13743,6 @@ S:	Maintained
 F:	drivers/media/i2c/tda9840*
 
 TEA5761 TUNER DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -13765,7 +13751,6 @@ S:	Odd fixes
 F:	drivers/media/tuners/tea5761.*
 
 TEA5767 TUNER DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -14181,7 +14166,6 @@ F:	Documentation/networking/tlan.txt
 F:	drivers/net/ethernet/ti/tlan.*
 
 TM6000 VIDEO4LINUX DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org
@@ -15408,7 +15392,6 @@ S:	Maintained
 F:	arch/x86/entry/vdso/
 
 XC2028/3028 TUNER DRIVER
-M:	Mauro Carvalho Chehab <[email protected]>
 M:	Mauro Carvalho Chehab <[email protected]>
 L:	[email protected]
 W:	https://linuxtv.org

drivers/media/i2c/saa7115.c

View file

diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
index e216cd7..b07114b 100644
--- a/drivers/media/i2c/saa7115.c
+++ b/drivers/media/i2c/saa7115.c
@@ -20,7 +20,7 @@
 //
 // VBI support (2004) and cleanups (2005) by Hans Verkuil <[email protected]>
 //
-// Copyright (c) 2005-2006 Mauro Carvalho Chehab <[email protected]>
+// Copyright (c) 2005-2006 Mauro Carvalho Chehab <[email protected]>
 //	SAA7111, SAA7113 and SAA7118 support
 
 #include "saa711x_regs.h"

drivers/media/i2c/saa711x_regs.h

View file

diff --git a/drivers/media/i2c/saa711x_regs.h b/drivers/media/i2c/saa711x_regs.h
index a50d480..44fabe0 100644
--- a/drivers/media/i2c/saa711x_regs.h
+++ b/drivers/media/i2c/saa711x_regs.h
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: GPL-2.0+
  * saa711x - Philips SAA711x video decoder register specifications
  *
- * Copyright (c) 2006 Mauro Carvalho Chehab <[email protected]>
+ * Copyright (c) 2006 Mauro Carvalho Chehab <[email protected]>
  */
 
 #define R_00_CHIP_VERSION                             0x00

drivers/media/i2c/tda7432.c

View file

diff --git a/drivers/media/i2c/tda7432.c b/drivers/media/i2c/tda7432.c
index 1c5c61d..9b4f212 100644
--- a/drivers/media/i2c/tda7432.c
+++ b/drivers/media/i2c/tda7432.c
@@ -8,7 +8,7 @@
  * Muting and tone control by Jonathan Isom <[email protected]>
  *
  * Copyright (c) 2000 Eric Sandeen <[email protected]>
- * Copyright (c) 2006 Mauro Carvalho Chehab <[email protected]>
+ * Copyright (c) 2006 Mauro Carvalho Chehab <[email protected]>
  * This code is placed under the terms of the GNU General Public License
  * Based on tda9855.c by Steve VanDeBogart ([email protected])
  * Which was based on tda8425.c by Greg Alexander (c) 1998

drivers/media/i2c/tvp5150.c

View file

diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 2476d81..1734ed4 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -2,7 +2,7 @@
 //
 // tvp5150 - Texas Instruments TVP5150A/AM1 and TVP5151 video decoder driver
 //
-// Copyright (c) 2005,2006 Mauro Carvalho Chehab <[email protected]>
+// Copyright (c) 2005,2006 Mauro Carvalho Chehab <[email protected]>
 
 #include <dt-bindings/media/tvp5150.h>
 #include <linux/i2c.h>

drivers/media/i2c/tvp5150_reg.h

View file

diff --git a/drivers/media/i2c/tvp5150_reg.h b/drivers/media/i2c/tvp5150_reg.h
index c43b7b8..d3a764c 100644
--- a/drivers/media/i2c/tvp5150_reg.h
+++ b/drivers/media/i2c/tvp5150_reg.h
@@ -3,7 +3,7 @@
  *
  * tvp5150 - Texas Instruments TVP5150A/AM1 video decoder registers
  *
- * Copyright (c) 2005,2006 Mauro Carvalho Chehab <[email protected]>
+ * Copyright (c) 2005,2006 Mauro Carvalho Chehab <[email protected]>
  */
 
 #define TVP5150_VD_IN_SRC_SEL_1      0x00 /* Video input source selection #1 */

drivers/media/i2c/tvp7002.c

View file

diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index a26c1a3..4599b7e 100644
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -5,7 +5,7 @@
  * Author: Santiago Nunez-Corrales <[email protected]>
  *
  * This code is partially based upon the TVP5150 driver
- * written by Mauro Carvalho Chehab ([email protected]),
+ * written by Mauro Carvalho Chehab <[email protected]>,
  * the TVP514x driver written by Vaibhav Hiremath <[email protected]>
  * and the TVP7002 driver in the TI LSP 2.10.00.14. Revisions by
  * Muralidharan Karicheri and Snehaprabha Narnakaje (TI).

drivers/media/i2c/tvp7002_reg.h

View file

diff --git a/drivers/media/i2c/tvp7002_reg.h b/drivers/media/i2c/tvp7002_reg.h
index 3c8c8b0..7f56ba6 100644
--- a/drivers/media/i2c/tvp7002_reg.h
+++ b/drivers/media/i2c/tvp7002_reg.h
@@ -5,7 +5,7 @@
  * Author: Santiago Nunez-Corrales <[email protected]>
  *
  * This code is partially based upon the TVP5150 driver
- * written by Mauro Carvalho Chehab ([email protected]),
+ * written by Mauro Carvalho Chehab <[email protected]>,
  * the TVP514x driver written by Vaibhav Hiremath <[email protected]>
  * and the TVP7002 driver in the TI LSP 2.10.00.14
  *

drivers/media/media-devnode.c

View file

diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index 67ac51e..6b87a72 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2010 Nokia Corporation
  *
  * Based on drivers/media/video/v4l2_dev.c code authored by
- *	Mauro Carvalho Chehab <[email protected]> (version 2)
+ *	Mauro Carvalho Chehab <[email protected]> (version 2)
  *	Alan Cox, <[email protected]> (version 1)
  *
  * Contacts: Laurent Pinchart <[email protected]>

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

View file

diff --git a/drivers/media/pci/bt8xx/bttv-audio-hook.c b/drivers/media/pci/bt8xx/bttv-audio-hook.c
index 9f1f916..346fc7f 100644
--- a/drivers/media/pci/bt8xx/bttv-audio-hook.c
+++ b/drivers/media/pci/bt8xx/bttv-audio-hook.c
@@ -1,7 +1,7 @@
 /*
  * Handlers for board audio hooks, splitted from bttv-cards
  *
- * Copyright (c) 2006 Mauro Carvalho Chehab ([email protected])
+ * Copyright (c) 2006 Mauro Carvalho Chehab <[email protected]>
  * This code is placed under the terms of the GNU General Public License
  */
 

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

View file

diff --git a/drivers/media/pci/bt8xx/bttv-audio-hook.h b/drivers/media/pci/bt8xx/bttv-audio-hook.h
index 159d07a..be16a53 100644
--- a/drivers/media/pci/bt8xx/bttv-audio-hook.h
+++ b/drivers/media/pci/bt8xx/bttv-audio-hook.h
@@ -1,7 +1,7 @@
 /*
  * Handlers for board audio hooks, splitted from bttv-cards
  *
- * Copyright (c) 2006 Mauro Carvalho Chehab ([email protected])
+ * Copyright (c) 2006 Mauro Carvalho Chehab <[email protected]>
  * This code is placed under the terms of the GNU General Public License
  */
 

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

View file

diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index 1902732..2616243 100644
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
@@ -2447,7 +2447,7 @@ struct tvcard bttv_tvcards[] = {
 	},
 		/* ---- card 0x88---------------------------------- */
 	[BTTV_BOARD_ACORP_Y878F] = {
-		/* Mauro Carvalho Chehab <[email protected]> */
+		/* Mauro Carvalho Chehab <[email protected]> */
 		.name		= "Acorp Y878F",
 		.video_inputs	= 3,
 		/* .audio_inputs= 1, */
@@ -2688,7 +2688,7 @@ struct tvcard bttv_tvcards[] = {
 	},
 	[BTTV_BOARD_ENLTV_FM_2] = {
 		/* Encore TV Tuner Pro ENL TV-FM-2
-		   Mauro Carvalho Chehab <[email protected] */
+		   Mauro Carvalho Chehab <[email protected]> */
 		.name           = "Encore ENL TV-FM-2",
 		.video_inputs   = 3,
 		/* .audio_inputs= 1, */

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

View file

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 707f57a..de3f44b 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -13,7 +13,7 @@
     (c) 2005-2006 Nickolay V. Shmyrev <[email protected]>
 
     Fixes to be fully V4L2 compliant by
-    (c) 2006 Mauro Carvalho Chehab <[email protected]>
+    (c) 2006 Mauro Carvalho Chehab <[email protected]>
 
     Cropping and overscan support
     Copyright (C) 2005, 2006 Michael H. Schimek <[email protected]>

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

View file

diff --git a/drivers/media/pci/bt8xx/bttv-i2c.c b/drivers/media/pci/bt8xx/bttv-i2c.c
index eccd1e3..c76823e 100644
--- a/drivers/media/pci/bt8xx/bttv-i2c.c
+++ b/drivers/media/pci/bt8xx/bttv-i2c.c
@@ -8,7 +8,7 @@
 			   & Marcus Metzler ([email protected])
     (c) 1999-2003 Gerd Knorr <[email protected]>
 
-    (c) 2005 Mauro Carvalho Chehab <[email protected]>
+    (c) 2005 Mauro Carvalho Chehab <[email protected]>
 	- Multituner support and i2c address binding
 
     This program is free software; you can redistribute it and/or modify

drivers/media/pci/cx23885/cx23885-input.c

View file

diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index be49589..395ff9b 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -13,7 +13,7 @@
  *  Copyright (C) 2008 <srinivasa.deevi at conexant dot com>
  *  Copyright (C) 2005 Ludovico Cavedon <[email protected]>
  *		       Markus Rechberger <[email protected]>
- *		       Mauro Carvalho Chehab <[email protected]>
+ *		       Mauro Carvalho Chehab <[email protected]>
  *		       Sascha Sommer <[email protected]>
  *  Copyright (C) 2004, 2005 Chris Pascoe
  *  Copyright (C) 2003, 2004 Gerd Knorr

drivers/media/pci/cx88/cx88-alsa.c

View file

diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index ab09bb5..8a28fda 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -4,7 +4,7 @@
  *
  *    (c) 2007 Trent Piepho <[email protected]>
  *    (c) 2005,2006 Ricardo Cerqueira <[email protected]>
- *    (c) 2005 Mauro Carvalho Chehab <[email protected]>
+ *    (c) 2005 Mauro Carvalho Chehab <[email protected]>
  *    Based on a dummy cx88 module by Gerd Knorr <[email protected]>
  *    Based on dummy.c by Jaroslav Kysela <[email protected]>
  *
@@ -103,7 +103,7 @@ MODULE_PARM_DESC(index, "Index value for cx88x capture interface(s).");
 
 MODULE_DESCRIPTION("ALSA driver module for cx2388x based TV cards");
 MODULE_AUTHOR("Ricardo Cerqueira");
-MODULE_AUTHOR("Mauro Carvalho Chehab <[email protected]>");
+MODULE_AUTHOR("Mauro Carvalho Chehab <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(CX88_VERSION);
 

drivers/media/pci/cx88/cx88-blackbird.c

View file

diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 0e0952e..7a4876c 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -5,7 +5,7 @@
  *    (c) 2004 Jelle Foks <[email protected]>
  *    (c) 2004 Gerd Knorr <[email protected]>
  *
- *    (c) 2005-2006 Mauro Carvalho Chehab <[email protected]>
+ *    (c) 2005-2006 Mauro Carvalho Chehab <[email protected]>
  *        - video_ioctl2 conversion
  *
  *  Includes parts from the ivtv driver <http://sourceforge.net/projects/ivtv/>

drivers/media/pci/cx88/cx88-core.c

View file

diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c
index 8bfa5b7..60988e9 100644
--- a/drivers/media/pci/cx88/cx88-core.c
+++ b/drivers/media/pci/cx88/cx88-core.c
@@ -4,7 +4,7 @@
  *
  * (c) 2003 Gerd Knorr <[email protected]> [SuSE Labs]
  *
- * (c) 2005-2006 Mauro Carvalho Chehab <[email protected]>
+ * (c) 2005-2006 Mauro Carvalho Chehab <[email protected]>
  *     - Multituner support
  *     - video_ioctl2 conversion
  *     - PAL/M fixes

drivers/media/pci/cx88/cx88-i2c.c

View file

diff --git a/drivers/media/pci/cx88/cx88-i2c.c b/drivers/media/pci/cx88/cx88-i2c.c
index f769277..99f88a0 100644
--- a/drivers/media/pci/cx88/cx88-i2c.c
+++ b/drivers/media/pci/cx88/cx88-i2c.c
@@ -8,7 +8,7 @@
  * (c) 2002 Yurij Sysoev <[email protected]>
  * (c) 1999-2003 Gerd Knorr <[email protected]>
  *
- * (c) 2005 Mauro Carvalho Chehab <[email protected]>
+ * (c) 2005 Mauro Carvalho Chehab <[email protected]>
  *	- Multituner support and i2c address binding
  *
  * This program is free software; you can redistribute it and/or modify

drivers/media/pci/cx88/cx88-video.c

View file

diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 9be682c..7b113ba 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -5,7 +5,7 @@
  *
  * (c) 2003-04 Gerd Knorr <[email protected]> [SuSE Labs]
  *
- * (c) 2005-2006 Mauro Carvalho Chehab <[email protected]>
+ * (c) 2005-2006 Mauro Carvalho Chehab <[email protected]>
  *	- Multituner support
  *	- video_ioctl2 conversion
  *	- PAL/M fixes

drivers/media/radio/radio-aimslab.c

View file

diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 5ef635e..4c52ac6 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -4,7 +4,7 @@
  * Copyright 1997 M. Kirkwood
  *
  * Converted to the radio-isa framework by Hans Verkuil <[email protected]>
- * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
+ * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
  * Converted to new API by Alan Cox <[email protected]>
  * Various bugfixes and enhancements by Russell Kroll <[email protected]>
  *

drivers/media/radio/radio-aztech.c

View file

diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 9e12c60..840b7d6 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -2,7 +2,7 @@
  * radio-aztech.c - Aztech radio card driver
  *
  * Converted to the radio-isa framework by Hans Verkuil <[email protected]>
- * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
+ * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
  * Adapted to support the Video for Linux API by
  * Russell Kroll <[email protected]>.  Based on original tuner code by:
  *

drivers/media/radio/radio-gemtek.c

View file

diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 3ff4c4e..f051f86 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -15,7 +15,7 @@
  *    Various bugfixes and enhancements by Russell Kroll <[email protected]>
  *
  * Converted to the radio-isa framework by Hans Verkuil <[email protected]>
- * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
+ * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
  *
  * Note: this card seems to swap the left and right audio channels!
  *

drivers/media/radio/radio-maxiradio.c

View file

diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 95f06f3..e4e7587 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -27,7 +27,7 @@
  * BUGS:
  *   - card unmutes if you change frequency
  *
- * (c) 2006, 2007 by Mauro Carvalho Chehab <[email protected]>:
+ * (c) 2006, 2007 by Mauro Carvalho Chehab <[email protected]>:
  *	- Conversion to V4L2 API
  *      - Uses video_ioctl2 for parsing and to add debug support
  */

drivers/media/radio/radio-rtrack2.c

View file

diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index abeaedd..5a1470e 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -7,7 +7,7 @@
  * Various bugfixes and enhancements by Russell Kroll <[email protected]>
  *
  * Converted to the radio-isa framework by Hans Verkuil <[email protected]>
- * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
+ * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
  *
  * Fully tested with actual hardware and the v4l2-compliance tool.
  */

drivers/media/radio/radio-sf16fmi.c

View file

diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index fc4e63d..4f9b97e 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -13,7 +13,7 @@
  *  No volume control - only mute/unmute - you have to use line volume
  *  control on SB-part of SF16-FMI/SF16-FMP/SF16-FMD
  *
- * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
+ * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
  */
 
 #include <linux/kernel.h>	/* __setup			*/

drivers/media/radio/radio-terratec.c

View file

diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 4f116ea..1af8f29 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -17,7 +17,7 @@
  *  Volume Control is done digitally
  *
  * Converted to the radio-isa framework by Hans Verkuil <[email protected]>
- * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
+ * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
  */
 
 #include <linux/module.h>	/* Modules			*/

drivers/media/radio/radio-trust.c

View file

diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index 26a8c60..a4bad32 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -12,7 +12,7 @@
  * Scott McGrath    ([email protected])
  * William McGrath  ([email protected])
  *
- * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
+ * Converted to V4L2 API by Mauro Carvalho Chehab <[email protected]>
  */
 
 #include <stdarg.h>

drivers/media/radio/radio-typhoon.c

View file

diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index eb72a4d..d0d67ad 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -25,7 +25,7 @@
  * The frequency change is necessary since the card never seems to be

This diff is incomplete. Download the complete patch.