diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 05:38:51 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 05:38:51 -1000 |
| commit | b99dc74253980287c826b8158327fc8f2ff03dad (patch) | |
| tree | 05271a97e9e64987555009cd7486a6813b798446 /drivers/media/pci/cx23885/cx23885-input.c | |
| parent | dac1acc3c216b09e04f173b3c1b94f1760ab3078 (diff) | |
| parent | 3259081991a9398434f6f49468b960f136ac0158 (diff) | |
| download | linux-b99dc74253980287c826b8158327fc8f2ff03dad.tar.bz2 | |
Merge tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
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 mchehab@kernel.org.
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
Diffstat (limited to 'drivers/media/pci/cx23885/cx23885-input.c')
| -rw-r--r-- | drivers/media/pci/cx23885/cx23885-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c index be49589a61d2..395ff9bba759 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 <cavedon@sssup.it> * Markus Rechberger <mrechberger@gmail.com> - * Mauro Carvalho Chehab <mchehab@infradead.org> + * Mauro Carvalho Chehab <mchehab@kernel.org> * Sascha Sommer <saschasommer@freenet.de> * Copyright (C) 2004, 2005 Chris Pascoe * Copyright (C) 2003, 2004 Gerd Knorr |