Merge tag 'perf-core-for-mingo-20160803' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / media / rc / mceusb.c

diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 5cf2e749b9ebdc654e33b8c19469a8d2859850b9..4f8c7effdceeb97597bc9b0afa252826020c4bfe 100644 (file)
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -887,6 +887,12 @@ static int mceusb_set_tx_mask(struct rc_dev *dev, u32 mask)
 {
        struct mceusb_dev *ir = dev->priv;
 
+       /* return number of transmitters */
+       int emitters = ir->num_txports ? ir->num_txports : 2;
+
+       if (mask >= (1 << emitters))
+               return emitters;
+
        if (ir->flags.tx_mask_normal)
                ir->tx_mask = mask;
        else
@@ -936,7 +942,7 @@ static int mceusb_set_tx_carrier(struct rc_dev *dev, u32 carrier)
 
        }
 
-       return carrier;
+       return 0;
 }
 
 /*