Skip to content

Commit 8c34b5c

Browse files
seanyoungmchehab
seanyoung
authored and
mchehab
committed
[media] rc: raw IR drivers cannot handle cec, unknown or other
unknown and other are for IR protocols for which we have no decoder, so the raw IR drivers have no chance of generating them. cec is not an IR protocol. Signed-off-by: Sean Young <[email protected]> Cc: Jiri Kosina <[email protected]> Cc: Benjamin Tissoires <[email protected]> Cc: Bruno Prémont <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent f4742e1 commit 8c34b5c

File tree

24 files changed

+40
-30
lines changed

24 files changed

+40
-30
lines changed

‎drivers/hid/hid-picolcd_cir.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ int picolcd_init_cir(struct picolcd_data *data, struct hid_report *report)
114114

115115
rdev->priv = data;
116116
rdev->driver_type = RC_DRIVER_IR_RAW;
117-
rdev->allowed_protocols = RC_BIT_ALL;
117+
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
118118
rdev->open = picolcd_cir_open;
119119
rdev->close = picolcd_cir_close;
120120
rdev->input_name = data->hdev->name;

‎drivers/media/common/siano/smsir.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
8787

8888
dev->priv = coredev;
8989
dev->driver_type = RC_DRIVER_IR_RAW;
90-
dev->allowed_protocols = RC_BIT_ALL;
90+
dev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
9191
dev->map_name = sms_get_board(board_id)->rc_codes;
9292
dev->driver_name = MODULE_NAME;
9393

‎drivers/media/pci/cx23885/cx23885-input.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -286,36 +286,36 @@ int cx23885_input_init(struct cx23885_dev *dev)
286286
case CX23885_BOARD_HAUPPAUGE_HVR1250:
287287
/* Integrated CX2388[58] IR controller */
288288
driver_type = RC_DRIVER_IR_RAW;
289-
allowed_protos = RC_BIT_ALL;
289+
allowed_protos = RC_BIT_ALL_IR_DECODER;
290290
/* The grey Hauppauge RC-5 remote */
291291
rc_map = RC_MAP_HAUPPAUGE;
292292
break;
293293
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
294294
/* Integrated CX23885 IR controller */
295295
driver_type = RC_DRIVER_IR_RAW;
296-
allowed_protos = RC_BIT_ALL;
296+
allowed_protos = RC_BIT_ALL_IR_DECODER;
297297
/* The grey Terratec remote with orange buttons */
298298
rc_map = RC_MAP_NEC_TERRATEC_CINERGY_XS;
299299
break;
300300
case CX23885_BOARD_TEVII_S470:
301301
/* Integrated CX23885 IR controller */
302302
driver_type = RC_DRIVER_IR_RAW;
303-
allowed_protos = RC_BIT_ALL;
303+
allowed_protos = RC_BIT_ALL_IR_DECODER;
304304
/* A guess at the remote */
305305
rc_map = RC_MAP_TEVII_NEC;
306306
break;
307307
case CX23885_BOARD_MYGICA_X8507:
308308
/* Integrated CX23885 IR controller */
309309
driver_type = RC_DRIVER_IR_RAW;
310-
allowed_protos = RC_BIT_ALL;
310+
allowed_protos = RC_BIT_ALL_IR_DECODER;
311311
/* A guess at the remote */
312312
rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02;
313313
break;
314314
case CX23885_BOARD_TBS_6980:
315315
case CX23885_BOARD_TBS_6981:
316316
/* Integrated CX23885 IR controller */
317317
driver_type = RC_DRIVER_IR_RAW;
318-
allowed_protos = RC_BIT_ALL;
318+
allowed_protos = RC_BIT_ALL_IR_DECODER;
319319
/* A guess at the remote */
320320
rc_map = RC_MAP_TBS_NEC;
321321
break;
@@ -327,13 +327,13 @@ int cx23885_input_init(struct cx23885_dev *dev)
327327
case CX23885_BOARD_DVBSKY_T982:
328328
/* Integrated CX23885 IR controller */
329329
driver_type = RC_DRIVER_IR_RAW;
330-
allowed_protos = RC_BIT_ALL;
330+
allowed_protos = RC_BIT_ALL_IR_DECODER;
331331
rc_map = RC_MAP_DVBSKY;
332332
break;
333333
case CX23885_BOARD_TT_CT2_4500_CI:
334334
/* Integrated CX23885 IR controller */
335335
driver_type = RC_DRIVER_IR_RAW;
336-
allowed_protos = RC_BIT_ALL;
336+
allowed_protos = RC_BIT_ALL_IR_DECODER;
337337
rc_map = RC_MAP_TT_1500;
338338
break;
339339
default:

‎drivers/media/rc/ene_ir.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)
10541054
learning_mode_force = false;
10551055

10561056
rdev->driver_type = RC_DRIVER_IR_RAW;
1057-
rdev->allowed_protocols = RC_BIT_ALL;
1057+
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
10581058
rdev->priv = dev;
10591059
rdev->open = ene_open;
10601060
rdev->close = ene_close;

‎drivers/media/rc/fintek-cir.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ static int fintek_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id
530530
/* Set up the rc device */
531531
rdev->priv = fintek;
532532
rdev->driver_type = RC_DRIVER_IR_RAW;
533-
rdev->allowed_protocols = RC_BIT_ALL;
533+
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
534534
rdev->open = fintek_open;
535535
rdev->close = fintek_close;
536536
rdev->input_name = FINTEK_DESCRIPTION;

‎drivers/media/rc/gpio-ir-recv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
165165
if (pdata->allowed_protos)
166166
rcdev->allowed_protocols = pdata->allowed_protos;
167167
else
168-
rcdev->allowed_protocols = RC_BIT_ALL;
168+
rcdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
169169
rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY;
170170

171171
gpio_dev->rcdev = rcdev;

‎drivers/media/rc/igorplugusb.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ static int igorplugusb_probe(struct usb_interface *intf,
203203
* This device can only store 36 pulses + spaces, which is not enough
204204
* for the NEC protocol and many others.
205205
*/
206-
rc->allowed_protocols = RC_BIT_ALL & ~(RC_BIT_NEC | RC_BIT_NECX |
207-
RC_BIT_NEC32 | RC_BIT_RC6_6A_20 |
206+
rc->allowed_protocols = RC_BIT_ALL_IR_DECODER & ~(RC_BIT_NEC |
207+
RC_BIT_NECX | RC_BIT_NEC32 | RC_BIT_RC6_6A_20 |
208208
RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE |
209209
RC_BIT_SONY20 | RC_BIT_MCE_KBD | RC_BIT_SANYO);
210210

‎drivers/media/rc/iguanair.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ static int iguanair_probe(struct usb_interface *intf,
491491
usb_to_input_id(ir->udev, &rc->input_id);
492492
rc->dev.parent = &intf->dev;
493493
rc->driver_type = RC_DRIVER_IR_RAW;
494-
rc->allowed_protocols = RC_BIT_ALL;
494+
rc->allowed_protocols = RC_BIT_ALL_IR_DECODER;
495495
rc->priv = ir;
496496
rc->open = iguanair_open;
497497
rc->close = iguanair_close;

‎drivers/media/rc/ir-hix5hd2.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
243243
priv->rate = clk_get_rate(priv->clock);
244244

245245
rdev->driver_type = RC_DRIVER_IR_RAW;
246-
rdev->allowed_protocols = RC_BIT_ALL;
246+
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
247247
rdev->priv = priv;
248248
rdev->open = hix5hd2_ir_open;
249249
rdev->close = hix5hd2_ir_close;

‎drivers/media/rc/ite-cir.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1557,7 +1557,7 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id
15571557
/* set up ir-core props */
15581558
rdev->priv = itdev;
15591559
rdev->driver_type = RC_DRIVER_IR_RAW;
1560-
rdev->allowed_protocols = RC_BIT_ALL;
1560+
rdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
15611561
rdev->open = ite_open;
15621562
rdev->close = ite_close;
15631563
rdev->s_idle = ite_s_idle;

0 commit comments

Comments
 (0)