Merge tag 'for-f2fs-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[cascardo/linux.git] / drivers / media / rc / winbond-cir.c

diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index d839f73..95ae60e 100644 (file)
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -615,6 +615,10 @@ wbcir_txmask(struct rc_dev *dev, u32 mask)
        unsigned long flags;
        u8 val;
 
+       /* return the number of transmitters */
+       if (mask > 15)
+               return 4;
+
        /* Four outputs, only one output can be enabled at a time */
        switch (mask) {
        case 0x1: