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 29ab9c2db06..599c19a7336 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)  	u32 scancode;  	u8 device, subdevice, function; -	if (!(dev->enabled_protocols & -	      (RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20))) +	if (!rc_protocols_enabled(dev, RC_BIT_SONY12 | RC_BIT_SONY15 | +				  RC_BIT_SONY20))  		return 0;  	if (!is_timing_event(ev)) { @@ -124,7 +124,7 @@ 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)) { +			if (!rc_protocols_enabled(dev, RC_BIT_SONY12)) {  				data->state = STATE_INACTIVE;  				return 0;  			} @@ -133,7 +133,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)  			function  = bitrev8((data->bits >>  4) & 0xFE);  			break;  		case 15: -			if (!(dev->enabled_protocols & RC_BIT_SONY15)) { +			if (!rc_protocols_enabled(dev, RC_BIT_SONY15)) {  				data->state = STATE_INACTIVE;  				return 0;  			} @@ -142,7 +142,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)  			function  = bitrev8((data->bits >>  7) & 0xFE);  			break;  		case 20: -			if (!(dev->enabled_protocols & RC_BIT_SONY20)) { +			if (!rc_protocols_enabled(dev, RC_BIT_SONY20)) {  				data->state = STATE_INACTIVE;  				return 0;  			}  | 
