From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 May 2019 18:13:17 +0000 (-0700)
Subject: Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e7a1414f9dc3498c4c35b9ca266d539e8bccab53;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'media/v5.1-2' of git://git./linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - remove the deprecated Zoran driver from staging

 - new I2C driver: ST MIPID02 CSI-2 camera bridge

 - new platform driver: Amlogic Meson AO CEC G12A Controller

 - add support for USB audio via the media controller

 - au0828 driver is now supported via the media controller on both on
   media and on usbaudio

 - new kernel test for the media device allocator

 - add support for stateless decoder at vicodec driver

 - lots of other driver improvements fixes and cleanups

* tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (218 commits)
  media: dt-bindings: aspeed-video: Add missing memory-region property
  media: platform: Aspeed: Make reserved memory optional
  media: platform: Aspeed: Remove use of reset line
  media: stm32-dcmi: return appropriate error codes during probe
  media: vsp1: Add support for missing 16-bit RGB555 formats
  media: vsp1: Add support for missing 16-bit RGB444 formats
  media: vsp1: Add support for missing 32-bit RGB formats
  media: v4l: Add definitions for missing 16-bit RGB555 formats
  media: v4l: Add definitions for missing 16-bit RGB4444 formats
  media: v4l: Add definitions for missing 32-bit RGB formats
  media: zoran: remove deprecated driver
  media: MAINTAINERS: Update AO CEC with ao-cec-g12a driver
  media: platform: meson: Add Amlogic Meson G12A AO CEC Controller driver
  media: dt-bindings: media: meson-ao-cec: Add G12A AO-CEC-B Compatible
  media: cros-ec-cec: decrement HDMI device refcount
  media: seco-cec: decrement HDMI device refcount
  media: tegra_cec: use new cec_notifier_parse_hdmi_phandle helper
  media: stih_cec: use new cec_notifier_parse_hdmi_phandle helper
  media: s5p_cec: use new cec_notifier_parse_hdmi_phandle helper
  media: meson: ao-cec: use new cec_notifier_parse_hdmi_phandle helper
  ...
---

e7a1414f9dc3498c4c35b9ca266d539e8bccab53
diff --cc drivers/media/media-request.c
index 9e5fd2ac769e,ed87305b29f9..e3fca436c75b
--- a/drivers/media/media-request.c
+++ b/drivers/media/media-request.c
@@@ -251,15 -251,15 +251,15 @@@ media_request_get_by_fd(struct media_de
  
  	if (!mdev || !mdev->ops ||
  	    !mdev->ops->req_validate || !mdev->ops->req_queue)
- 		return ERR_PTR(-EACCES);
+ 		return ERR_PTR(-EBADR);
  
 -	filp = fget(request_fd);
 -	if (!filp)
 +	f = fdget(request_fd);
 +	if (!f.file)
  		goto err_no_req_fd;
  
 -	if (filp->f_op != &request_fops)
 +	if (f.file->f_op != &request_fops)
  		goto err_fput;
 -	req = filp->private_data;
 +	req = f.file->private_data;
  	if (req->mdev != mdev)
  		goto err_fput;
  
diff --cc drivers/staging/media/imx/imx-media-internal-sd.c
index c547280a309e,dc510dcfe160..df49ebfbe98a
--- a/drivers/staging/media/imx/imx-media-internal-sd.c
+++ b/drivers/staging/media/imx/imx-media-internal-sd.c
@@@ -2,9 -1,14 +2,9 @@@
  /*
   * Media driver for Freescale i.MX5/6 SOC
   *
-  * Adds the internal subdevices and the media links between them.
+  * Adds the IPU internal subdevices and the media links between them.
   *
   * Copyright (c) 2016 Mentor Graphics Inc.
 - *
 - * 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
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
   */
  #include <linux/platform_device.h>
  #include "imx-media.h"