]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] pulse8-cec: set all_device_types when restoring config
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 1 Nov 2016 08:47:10 +0000 (06:47 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 16 Nov 2016 17:29:37 +0000 (15:29 -0200)
When the persistent state is restored, the all_device_types field
was never filled in. Fix this.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/staging/media/pulse8-cec/pulse8-cec.c

index 1732c3857b8eaada9a37d647a58ccffc20cee711..9092494bb43ca547d069636c6798be58163b7cdb 100644 (file)
@@ -375,27 +375,35 @@ static int pulse8_setup(struct pulse8 *pulse8, struct serio *serio,
        switch (log_addrs->primary_device_type[0]) {
        case CEC_OP_PRIM_DEVTYPE_TV:
                log_addrs->log_addr_type[0] = CEC_LOG_ADDR_TYPE_TV;
+               log_addrs->all_device_types[0] = CEC_OP_ALL_DEVTYPE_TV;
                break;
        case CEC_OP_PRIM_DEVTYPE_RECORD:
                log_addrs->log_addr_type[0] = CEC_LOG_ADDR_TYPE_RECORD;
+               log_addrs->all_device_types[0] = CEC_OP_ALL_DEVTYPE_RECORD;
                break;
        case CEC_OP_PRIM_DEVTYPE_TUNER:
                log_addrs->log_addr_type[0] = CEC_LOG_ADDR_TYPE_TUNER;
+               log_addrs->all_device_types[0] = CEC_OP_ALL_DEVTYPE_TUNER;
                break;
        case CEC_OP_PRIM_DEVTYPE_PLAYBACK:
                log_addrs->log_addr_type[0] = CEC_LOG_ADDR_TYPE_PLAYBACK;
+               log_addrs->all_device_types[0] = CEC_OP_ALL_DEVTYPE_PLAYBACK;
                break;
        case CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM:
                log_addrs->log_addr_type[0] = CEC_LOG_ADDR_TYPE_PLAYBACK;
+               log_addrs->all_device_types[0] = CEC_OP_ALL_DEVTYPE_AUDIOSYSTEM;
                break;
        case CEC_OP_PRIM_DEVTYPE_SWITCH:
                log_addrs->log_addr_type[0] = CEC_LOG_ADDR_TYPE_UNREGISTERED;
+               log_addrs->all_device_types[0] = CEC_OP_ALL_DEVTYPE_SWITCH;
                break;
        case CEC_OP_PRIM_DEVTYPE_PROCESSOR:
                log_addrs->log_addr_type[0] = CEC_LOG_ADDR_TYPE_SPECIFIC;
+               log_addrs->all_device_types[0] = CEC_OP_ALL_DEVTYPE_SWITCH;
                break;
        default:
                log_addrs->log_addr_type[0] = CEC_LOG_ADDR_TYPE_UNREGISTERED;
+               log_addrs->all_device_types[0] = CEC_OP_ALL_DEVTYPE_SWITCH;
                dev_info(pulse8->dev, "Unknown Primary Device Type: %d\n",
                         log_addrs->primary_device_type[0]);
                break;