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

Commit 13a3cec8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (101 commits)
  [media] staging/lirc: fix mem leaks and ptr err usage
  [media] hdpvr: reduce latency of i2c read/write w/recycled buffer
  [media] hdpvr: enable IR part
  [media] rc/mceusb: timeout should be in ns, not us
  [media] v4l2-device: fix 'use-after-freed' oops
  [media] v4l2-dev: don't memset video_device.dev
  [media] zoran: use video_device_alloc instead of kmalloc
  [media] w9966: zero device state after a detach
  [media] v4l: Fix a use-before-set in the control framework
  [media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h
  [media] DocBook/v4l: update V4L2 revision and update copyright years
  [media] DocBook/v4l: fix validation error in dev-rds.xml
  [media] v4l2-ctrls: queryctrl shouldn't attempt to replace V4L2_CID_PRIVATE_BASE IDs
  [media] v4l2-ctrls: fix missing 'read-only' check
  [media] pvrusb2: Provide more information about IR units to lirc_zilog and ir-kbd-i2c
  [media] ir-kbd-i2c: Add back defaults setting for Zilog Z8's at addr 0x71
  [media] lirc_zilog: Update TODO.lirc_zilog
  [media] lirc_zilog: Add Andy Walls to copyright notice and authors list
  [media] lirc_zilog: Remove useless struct i2c_driver.command function
  [media] lirc_zilog: Remove unneeded tests for existence of the IR Tx function
  ...
parents 973c9f4f 88914bdf

Documentation/DocBook/dvb/dvbapi.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
	<holder>Convergence GmbH</holder>

	<holder>Convergence GmbH</holder>

</copyright>

</copyright>

<copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

</copyright>

Documentation/DocBook/media.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
<title>LINUX MEDIA INFRASTRUCTURE API</title>

<title>LINUX MEDIA INFRASTRUCTURE API</title>





<copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>LinuxTV Developers</holder>

	<holder>LinuxTV Developers</holder>

</copyright>

</copyright>
@@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled 
</author>

</author>

</authorgroup>

</authorgroup>

<copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

</copyright>

Documentation/DocBook/v4l/dev-rds.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ as follows:</para> 
  </section>

  </section>





  <section>

  <section>

    <title>RDS datastructures</title>

    <table frame="none" pgwide="1" id="v4l2-rds-data">

    <table frame="none" pgwide="1" id="v4l2-rds-data">

      <title>struct

      <title>struct

<structname>v4l2_rds_data</structname></title>

<structname>v4l2_rds_data</structname></title>
@@ -129,10 +130,11 @@ as follows:</para> 




    <table frame="none" pgwide="1" id="v4l2-rds-block-codes">

    <table frame="none" pgwide="1" id="v4l2-rds-block-codes">

      <title>Block defines</title>

      <title>Block defines</title>

      <tgroup cols="3">

      <tgroup cols="4">

	<colspec colname="c1" colwidth="1*" />

	<colspec colname="c1" colwidth="1*" />

	<colspec colname="c2" colwidth="1*" />

	<colspec colname="c2" colwidth="1*" />

	<colspec colname="c3" colwidth="5*" />

	<colspec colname="c3" colwidth="1*" />

	<colspec colname="c4" colwidth="5*" />

	<tbody valign="top">

	<tbody valign="top">

	  <row>

	  <row>

	    <entry>V4L2_RDS_BLOCK_MSK</entry>

	    <entry>V4L2_RDS_BLOCK_MSK</entry>

Documentation/DocBook/v4l/v4l2.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -100,6 +100,7 @@ Remote Controller chapter.</contrib> 
      <year>2008</year>

      <year>2008</year>

      <year>2009</year>

      <year>2009</year>

      <year>2010</year>

      <year>2010</year>

      <year>2011</year>

      <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin

      <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin

Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab</holder>

Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab</holder>

    </copyright>

    </copyright>
@@ -381,7 +382,7 @@ and discussions on the V4L mailing list.</revremark> 
</partinfo>

</partinfo>





<title>Video for Linux Two API Specification</title>

<title>Video for Linux Two API Specification</title>

 <subtitle>Revision 2.6.33</subtitle>

 <subtitle>Revision 2.6.38</subtitle>





  <chapter id="common">

  <chapter id="common">

    &sub-common;

    &sub-common;

Documentation/video4linux/v4l2-controls.txt

+12 −0
Original line number Original line Diff line number Diff line
@@ -285,6 +285,9 @@ implement g_volatile_ctrl like this: 
The 'new value' union is not used in g_volatile_ctrl. In general controls

The 'new value' union is not used in g_volatile_ctrl. In general controls

that need to implement g_volatile_ctrl are read-only controls.

that need to implement g_volatile_ctrl are read-only controls.





Note that if one or more controls in a control cluster are marked as volatile,

then all the controls in the cluster are seen as volatile.



To mark a control as volatile you have to set the is_volatile flag:

To mark a control as volatile you have to set the is_volatile flag:





	ctrl = v4l2_ctrl_new_std(&sd->ctrl_handler, ...);

	ctrl = v4l2_ctrl_new_std(&sd->ctrl_handler, ...);
@@ -462,6 +465,15 @@ pointer to the v4l2_ctrl_ops struct that is used for that cluster. 
Obviously, all controls in the cluster array must be initialized to either

Obviously, all controls in the cluster array must be initialized to either

a valid control or to NULL.

a valid control or to NULL.





In rare cases you might want to know which controls of a cluster actually

were set explicitly by the user. For this you can check the 'is_new' flag of

each control. For example, in the case of a volume/mute cluster the 'is_new'

flag of the mute control would be set if the user called VIDIOC_S_CTRL for

mute only. If the user would call VIDIOC_S_EXT_CTRLS for both mute and volume

controls, then the 'is_new' flag would be 1 for both controls.



The 'is_new' flag is always 1 when called from v4l2_ctrl_handler_setup().







VIDIOC_LOG_STATUS Support

VIDIOC_LOG_STATUS Support

=========================

=========================