Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3626005 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media fixes from Mauro Carvalho Chehab:
 "A series of media updates/fixes for 4.17.

  There are two important core fix patches in this series:

   - A regression fix on Kernel 4.16 with causes it to not work with
     some input devices that depend on media core

   - A fix at compat32 bits with causes it to OOPS on overlay, and
     affects the Kernels where the CVE-2017-13166 was backported

  The remaining ones are other random fixes at the documentation and on
  drivers.

  The biggest part of this series is a set of 18 patches for the Intel
  atomisp driver. Currently, it produces hundreds of warnings/errors on
  sparse/smatch, causing me to sometimes ignore new warnings on other
  drivers that are not so broken. This driver is on really poor state,
  even for staging standards: it has several layers of abstraction on
  it, and it supports two different hardware. Selecting between them
  require to add a define (there isn't even a Kconfig option for such
  purpose). Just on this smatch cleanup, I could easily get rid of 8
  "do-nothing" files. So, I'm seriously considering its removal from
  upstream, if I don't see any real work on addressing the problems
  there along this year"

* tag 'media/v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (48 commits)
  media: v4l2-core: fix size of devnode_nums[] bitarray
  media: v4l2-compat-ioctl32: don't oops on overlay
  media: i2c: adv748x: afe: fix sparse warning
  media: extended-controls.rst: transmitter -> receiver
  media: staging: atomisp: stop duplicating input format types
  media: staging: atomisp: get rid of an unused var
  media: staging: atomisp: stop mixing enum types
  media: staging: atomisp: get rid of some static warnings
  media: staging: atomisp: use %p to print pointers
  media: staging: atomisp: remove an useless check
  media: staging: atomisp: avoid a warning if 32 bits build
  media: staging: atomisp: don't access a NULL var
  media: staging: atomisp: Get rid of *default.host.[ch]
  media: staging: atomisp: get rid of an unused function
  media: staging: atomisp: remove unused set_pd_base()
  media: staging: atomisp: fix endianess issues
  media: staging: atomisp: add a missing include
  media: staging: atomisp: get rid of stupid statements
  media: staging: atomisp: declare static vars as such
  media: staging: atomisp: ia_css_output.host: don't use var before check
  ...
parents 71219b34 a95845ba

Documentation/media/kapi/v4l2-dev.rst

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ of the video device exits. 
The default :c:func:`video_device_release` callback currently

just calls ``kfree`` to free the allocated memory.



There is also a ::c:func:`video_device_release_empty` function that does

There is also a :c:func:`video_device_release_empty` function that does

nothing (is empty) and should be used if the struct is embedded and there

is nothing to do when it is released.

Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ id's until they get an error. 


       -

       -

       -  Entity type, see :ref:`media-entity-type` for details.

       -  Entity type, see :ref:`media-entity-functions` for details.



    -  .. row 4

Documentation/media/uapi/mediactl/media-ioc-g-topology.rst

+4 −4
Original line number Diff line number Diff line
@@ -205,13 +205,13 @@ desired arrays with the media graph elements. 


       -  ``function``



       -  Entity main function, see :ref:`media-entity-type` for details.

       -  Entity main function, see :ref:`media-entity-functions` for details.



    -  .. row 4



       -  __u32



       -  ``reserved``\ [12]

       -  ``reserved``\ [6]



       -  Reserved for future extensions. Drivers and applications must set

	  this array to zero.
@@ -334,7 +334,7 @@ desired arrays with the media graph elements. 


       -  __u32



       -  ``reserved``\ [9]

       -  ``reserved``\ [5]



       -  Reserved for future extensions. Drivers and applications must set

	  this array to zero.
@@ -390,7 +390,7 @@ desired arrays with the media graph elements. 


       -  __u32



       -  ``reserved``\ [5]

       -  ``reserved``\ [6]



       -  Reserved for future extensions. Drivers and applications must set

	  this array to zero.

Documentation/media/uapi/mediactl/media-types.rst

+2 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ Types and flags used to represent the media graph elements 


..  tabularcolumns:: |p{8.2cm}|p{10.3cm}|



.. _media-entity-type:

.. _media-entity-functions:



.. cssclass:: longtable



.. flat-table:: Media entity types

.. flat-table:: Media entity functions

    :header-rows:  0

    :stub-columns: 0

Documentation/media/uapi/v4l/extended-controls.rst

+1 −1
Original line number Diff line number Diff line
@@ -3565,7 +3565,7 @@ enum v4l2_dv_it_content_type - 
    HDMI carries 5V on one of the pins). This is often used to power an

    eeprom which contains EDID information, such that the source can

    read the EDID even if the sink is in standby/power off. Each bit

    corresponds to an input pad on the transmitter. If an input pad

    corresponds to an input pad on the receiver. If an input pad

    cannot detect whether power is present, then the bit for that pad

    will be 0. This read-only control is applicable to DVI-D, HDMI and

    DisplayPort connectors.