diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 18:38:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-04 18:38:51 +0300 |
| commit | b99dc74253980287c826b8158327fc8f2ff03dad (patch) | |
| tree | 05271a97e9e64987555009cd7486a6813b798446 /drivers/media/radio/radio-aztech.c | |
| parent | dac1acc3c216b09e04f173b3c1b94f1760ab3078 (diff) | |
| parent | 3259081991a9398434f6f49468b960f136ac0158 (diff) | |
| download | linux-b99dc74253980287c826b8158327fc8f2ff03dad.tar.xz | |
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/radio/radio-aztech.c')
| -rw-r--r-- | drivers/media/radio/radio-aztech.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index 9e12c6027359..840b7d60462b 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 <hans.verkuil@xs4all.nl> - * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@infradead.org> + * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@kernel.org> * Adapted to support the Video for Linux API by * Russell Kroll <rkroll@exploits.org>. Based on original tuner code by: * |