diff options
Diffstat (limited to 'drivers/media/rc/ir-sony-decoder.c')
-rw-r--r-- | drivers/media/rc/ir-sony-decoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c index 29ab9c2db060..599c19a73360 100644 --- a/drivers/media/rc/ir-sony-decoder.c +++ b/drivers/media/rc/ir-sony-decoder.c | |||
@@ -45,8 +45,8 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
45 | u32 scancode; | 45 | u32 scancode; |
46 | u8 device, subdevice, function; | 46 | u8 device, subdevice, function; |
47 | 47 | ||
48 | if (!(dev->enabled_protocols & | 48 | if (!rc_protocols_enabled(dev, RC_BIT_SONY12 | RC_BIT_SONY15 | |
49 | (RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20))) | 49 | RC_BIT_SONY20)) |
50 | return 0; | 50 | return 0; |
51 | 51 | ||
52 | if (!is_timing_event(ev)) { | 52 | if (!is_timing_event(ev)) { |
@@ -124,7 +124,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
124 | 124 | ||
125 | switch (data->count) { | 125 | switch (data->count) { |
126 | case 12: | 126 | case 12: |
127 | if (!(dev->enabled_protocols & RC_BIT_SONY12)) { | 127 | if (!rc_protocols_enabled(dev, RC_BIT_SONY12)) { |
128 | data->state = STATE_INACTIVE; | 128 | data->state = STATE_INACTIVE; |
129 | return 0; | 129 | return 0; |
130 | } | 130 | } |
@@ -133,7 +133,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
133 | function = bitrev8((data->bits >> 4) & 0xFE); | 133 | function = bitrev8((data->bits >> 4) & 0xFE); |
134 | break; | 134 | break; |
135 | case 15: | 135 | case 15: |
136 | if (!(dev->enabled_protocols & RC_BIT_SONY15)) { | 136 | if (!rc_protocols_enabled(dev, RC_BIT_SONY15)) { |
137 | data->state = STATE_INACTIVE; | 137 | data->state = STATE_INACTIVE; |
138 | return 0; | 138 | return 0; |
139 | } | 139 | } |
@@ -142,7 +142,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev) | |||
142 | function = bitrev8((data->bits >> 7) & 0xFE); | 142 | function = bitrev8((data->bits >> 7) & 0xFE); |
143 | break; | 143 | break; |
144 | case 20: | 144 | case 20: |
145 | if (!(dev->enabled_protocols & RC_BIT_SONY20)) { | 145 | if (!rc_protocols_enabled(dev, RC_BIT_SONY20)) { |
146 | data->state = STATE_INACTIVE; | 146 | data->state = STATE_INACTIVE; |
147 | return 0; | 147 | return 0; |
148 | } | 148 | } |