[media] rc: make s_tx_carrier consistent

LIRC_SET_SEND_CARRIER should return 0 on success or -errno.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/Documentation/DocBook/media/v4l/lirc_device_interface.xml b/Documentation/DocBook/media/v4l/lirc_device_interface.xml
index 34cada2ca71038694f11faa3f1060fe641b12bd1..71f9dbb81ec7ed5a6f22eb34675adaed86417e3c 100644 (file)
--- a/Documentation/DocBook/media/v4l/lirc_device_interface.xml
+++ b/Documentation/DocBook/media/v4l/lirc_device_interface.xml
@@ -157,7 +157,7 @@ on working with the default settings initially.</para>
   <varlistentry>
     <term>LIRC_SET_{SEND,REC}_CARRIER</term>
     <listitem>
-      <para>Set send/receive carrier (in Hz).</para>
+      <para>Set send/receive carrier (in Hz). Return 0 on success.</para>
     </listitem>
   </varlistentry>
   <varlistentry>

diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index 8d77e1c4a141e54cc860bc35f0ef2a12f0390a0f..d1c61cd035f6fb9d32e3fac435ec2d69be1479e6 100644 (file)
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -904,7 +904,7 @@ static int ene_set_tx_carrier(struct rc_dev *rdev, u32 carrier)
 
                dbg("TX: out of range %d-%d kHz carrier",
                        2000 / ENE_CIRMOD_PRD_MIN, 2000 / ENE_CIRMOD_PRD_MAX);
-               return -1;
+               return -EINVAL;
        }
 
        dev->tx_period = period;

diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
index ee60e17fba05d715c1a7b10bdc8013575f445a10..5f634545ddd81c6e98887ed93a8fc2abb8a29f21 100644 (file)
--- a/drivers/media/rc/iguanair.c
+++ b/drivers/media/rc/iguanair.c
@@ -330,7 +330,7 @@ static int iguanair_set_tx_carrier(struct rc_dev *dev, uint32_t carrier)
 
        mutex_unlock(&ir->lock);
 
-       return carrier;
+       return 0;
 }
 
 static int iguanair_set_tx_mask(struct rc_dev *dev, uint32_t mask)

diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 2d1585d9bd9ef107d6780a4f5cae4ecff9361b74..4f8c7effdceeb97597bc9b0afa252826020c4bfe 100644 (file)
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -942,7 +942,7 @@ static int mceusb_set_tx_carrier(struct rc_dev *dev, u32 carrier)
 
        }
 
-       return carrier;
+       return 0;
 }
 
 /*

diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index ec74244a38530a937d07280a304debdf7a5988b7..6adea78c1f695134b04677663332abad8ef69726 100644 (file)
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -708,7 +708,7 @@ static int redrat3_set_tx_carrier(struct rc_dev *rcdev, u32 carrier)
 
        rr3->carrier = carrier;
 
-       return carrier;
+       return 0;
 }
 
 static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf,