These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / rc / ir-sony-decoder.c

diff --git a/kernel/drivers/media/rc/ir-sony-decoder.c b/kernel/drivers/media/rc/ir-sony-decoder.c
index d12dc3d..58ef06f 100644 (file)
--- a/kernel/drivers/media/rc/ir-sony-decoder.c
+++ b/kernel/drivers/media/rc/ir-sony-decoder.c
@@ -125,30 +125,27 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
 
                switch (data->count) {
                case 12:
-                       if (!(dev->enabled_protocols & RC_BIT_SONY12)) {
-                               data->state = STATE_INACTIVE;
-                               return 0;
-                       }
+                       if (!(dev->enabled_protocols & RC_BIT_SONY12))
+                               goto finish_state_machine;
+
                        device    = bitrev8((data->bits <<  3) & 0xF8);
                        subdevice = 0;
                        function  = bitrev8((data->bits >>  4) & 0xFE);
                        protocol = RC_TYPE_SONY12;
                        break;
                case 15:
-                       if (!(dev->enabled_protocols & RC_BIT_SONY15)) {
-                               data->state = STATE_INACTIVE;
-                               return 0;
-                       }
+                       if (!(dev->enabled_protocols & RC_BIT_SONY15))
+                               goto finish_state_machine;
+
                        device    = bitrev8((data->bits >>  0) & 0xFF);
                        subdevice = 0;
                        function  = bitrev8((data->bits >>  7) & 0xFE);
                        protocol = RC_TYPE_SONY15;
                        break;
                case 20:
-                       if (!(dev->enabled_protocols & RC_BIT_SONY20)) {
-                               data->state = STATE_INACTIVE;
-                               return 0;
-                       }
+                       if (!(dev->enabled_protocols & RC_BIT_SONY20))
+                               goto finish_state_machine;
+
                        device    = bitrev8((data->bits >>  5) & 0xF8);
                        subdevice = bitrev8((data->bits >>  0) & 0xFF);
                        function  = bitrev8((data->bits >> 12) & 0xFE);
@@ -162,8 +159,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
                scancode = device << 16 | subdevice << 8 | function;
                IR_dprintk(1, "Sony(%u) scancode 0x%05x\n", data->count, scancode);
                rc_keydown(dev, protocol, scancode, 0);
-               data->state = STATE_INACTIVE;
-               return 0;
+               goto finish_state_machine;
        }
 
 out:
@@ -171,6 +167,10 @@ out:
                   data->state, TO_US(ev.duration), TO_STR(ev.pulse));
        data->state = STATE_INACTIVE;
        return -EINVAL;
+
+finish_state_machine:
+       data->state = STATE_INACTIVE;
+       return 0;
 }
 
 static struct ir_raw_handler sony_handler = {