aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-07-05 12:39:38 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:37 -0400
commitc1798c90adabf16713086f34a793d89d147022a5 (patch)
tree682a3a07312056dd74576cd862cac3367fc0edbd
parentb424f60c5b728c27b0bd719a907847ad4c0e7e59 (diff)
[media] DocBook/demux.xml: Remove generic errors
Remove generic errors from ioctl() descriptions. For other ioctl's, there's no generic section. So, just keep whatever is there. Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/DocBook/media/dvb/demux.xml88
-rw-r--r--Documentation/DocBook/media/v4l/gen-errors.xml5
2 files changed, 5 insertions, 88 deletions
diff --git a/Documentation/DocBook/media/dvb/demux.xml b/Documentation/DocBook/media/dvb/demux.xml
index e5058d7d9213..37c17908aa40 100644
--- a/Documentation/DocBook/media/dvb/demux.xml
+++ b/Documentation/DocBook/media/dvb/demux.xml
@@ -552,13 +552,6 @@ typedef enum {
552&return-value-dvb; 552&return-value-dvb;
553<informaltable><tgroup cols="2"><tbody><row><entry 553<informaltable><tgroup cols="2"><tbody><row><entry
554 align="char"> 554 align="char">
555<para>EBADF</para>
556</entry><entry
557 align="char">
558<para>fd is not a valid file descriptor.</para>
559</entry>
560 </row><row><entry
561 align="char">
562<para>EINVAL</para> 555<para>EINVAL</para>
563</entry><entry 556</entry><entry
564 align="char"> 557 align="char">
@@ -615,14 +608,6 @@ typedef enum {
615</entry> 608</entry>
616 </row></tbody></tgroup></informaltable> 609 </row></tbody></tgroup></informaltable>
617&return-value-dvb; 610&return-value-dvb;
618<informaltable><tgroup cols="2"><tbody><row><entry
619 align="char">
620<para>EBADF</para>
621</entry><entry
622 align="char">
623<para>fd is not a valid file descriptor.</para>
624</entry>
625 </row></tbody></tgroup></informaltable>
626</section> 611</section>
627 612
628<section id="DMX_SET_FILTER"> 613<section id="DMX_SET_FILTER">
@@ -677,21 +662,6 @@ typedef enum {
677</entry> 662</entry>
678 </row></tbody></tgroup></informaltable> 663 </row></tbody></tgroup></informaltable>
679&return-value-dvb; 664&return-value-dvb;
680<informaltable><tgroup cols="2"><tbody><row><entry
681 align="char">
682<para>EBADF</para>
683</entry><entry
684 align="char">
685<para>fd is not a valid file descriptor.</para>
686</entry>
687 </row><row><entry
688 align="char">
689<para>EINVAL</para>
690</entry><entry
691 align="char">
692<para>Invalid argument.</para>
693</entry>
694 </row></tbody></tgroup></informaltable>
695</section> 665</section>
696 666
697<section id="DMX_SET_PES_FILTER"> 667<section id="DMX_SET_PES_FILTER">
@@ -751,20 +721,6 @@ typedef enum {
751&return-value-dvb; 721&return-value-dvb;
752<informaltable><tgroup cols="2"><tbody><row><entry 722<informaltable><tgroup cols="2"><tbody><row><entry
753 align="char"> 723 align="char">
754<para>EBADF</para>
755</entry><entry
756 align="char">
757<para>fd is not a valid file descriptor.</para>
758</entry>
759 </row><row><entry
760 align="char">
761<para>EINVAL</para>
762</entry><entry
763 align="char">
764<para>Invalid argument.</para>
765</entry>
766 </row><row><entry
767 align="char">
768<para>EBUSY</para> 724<para>EBUSY</para>
769</entry><entry 725</entry><entry
770 align="char"> 726 align="char">
@@ -820,22 +776,6 @@ typedef enum {
820</entry> 776</entry>
821 </row></tbody></tgroup></informaltable> 777 </row></tbody></tgroup></informaltable>
822&return-value-dvb; 778&return-value-dvb;
823<informaltable><tgroup cols="2"><tbody><row><entry
824 align="char">
825<para>EBADF</para>
826</entry><entry
827 align="char">
828<para>fd is not a valid file descriptor.</para>
829</entry>
830 </row><row><entry
831 align="char">
832<para>ENOMEM</para>
833</entry><entry
834 align="char">
835<para>The driver was not able to allocate a buffer of the
836 requested size.</para>
837</entry>
838 </row></tbody></tgroup></informaltable>
839</section> 779</section>
840 780
841<section id="DMX_GET_EVENT"> 781<section id="DMX_GET_EVENT">
@@ -894,20 +834,6 @@ typedef enum {
894&return-value-dvb; 834&return-value-dvb;
895<informaltable><tgroup cols="2"><tbody><row><entry 835<informaltable><tgroup cols="2"><tbody><row><entry
896 align="char"> 836 align="char">
897<para>EBADF</para>
898</entry><entry
899 align="char">
900<para>fd is not a valid file descriptor.</para>
901</entry>
902 </row><row><entry
903 align="char">
904<para>EFAULT</para>
905</entry><entry
906 align="char">
907<para>ev points to an invalid address.</para>
908</entry>
909 </row><row><entry
910 align="char">
911<para>EWOULDBLOCK</para> 837<para>EWOULDBLOCK</para>
912</entry><entry 838</entry><entry
913 align="char"> 839 align="char">
@@ -967,20 +893,6 @@ typedef enum {
967&return-value-dvb; 893&return-value-dvb;
968<informaltable><tgroup cols="2"><tbody><row><entry 894<informaltable><tgroup cols="2"><tbody><row><entry
969 align="char"> 895 align="char">
970<para>EBADF</para>
971</entry><entry
972 align="char">
973<para>fd is not a valid file descriptor.</para>
974</entry>
975 </row><row><entry
976 align="char">
977<para>EFAULT</para>
978</entry><entry
979 align="char">
980<para>stc points to an invalid address.</para>
981</entry>
982 </row><row><entry
983 align="char">
984<para>EINVAL</para> 896<para>EINVAL</para>
985</entry><entry 897</entry><entry
986 align="char"> 898 align="char">
diff --git a/Documentation/DocBook/media/v4l/gen-errors.xml b/Documentation/DocBook/media/v4l/gen-errors.xml
index d970f080f88d..c9818799764d 100644
--- a/Documentation/DocBook/media/v4l/gen-errors.xml
+++ b/Documentation/DocBook/media/v4l/gen-errors.xml
@@ -48,6 +48,11 @@
48 that this request would overcommit the usb bandwidth reserved 48 that this request would overcommit the usb bandwidth reserved
49 for periodic transfers (up to 80% of the USB bandwidth).</entry> 49 for periodic transfers (up to 80% of the USB bandwidth).</entry>
50 </row> 50 </row>
51 <row>
52 <entry>EWOULDBLOCK</entry>
53 <entry>Operation would block. Used when the ioctl would need to wait
54 for an event, but the device was opened in non-blocking mode.</entry>
55 </row>
51 </tbody> 56 </tbody>
52 </tgroup> 57 </tgroup>
53</table> 58</table>