mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
linux: drop upstream patch
This commit is contained in:
parent
ef4443c1de
commit
42ed3d20b6
@ -1,46 +0,0 @@
|
||||
From d13ee07f431c94ea72320ea4136e75ebeaee98c1 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Fri, 3 Mar 2017 10:27:44 +0100
|
||||
Subject: [PATCH] backport: rc: raw decoder for keymap protocol is not loaded
|
||||
on register
|
||||
|
||||
see http://www.spinics.net/lists/linux-media/msg111651.html
|
||||
---
|
||||
drivers/media/rc/rc-main.c | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
|
||||
index dedaf38..9a397da 100644
|
||||
--- a/drivers/media/rc/rc-main.c
|
||||
+++ b/drivers/media/rc/rc-main.c
|
||||
@@ -1441,6 +1441,7 @@ int rc_register_device(struct rc_dev *dev)
|
||||
int attr = 0;
|
||||
int minor;
|
||||
int rc;
|
||||
+ u64 rc_type;
|
||||
|
||||
if (!dev || !dev->map_name)
|
||||
return -EINVAL;
|
||||
@@ -1526,14 +1527,18 @@ int rc_register_device(struct rc_dev *dev)
|
||||
goto out_input;
|
||||
}
|
||||
|
||||
+ rc_type = BIT_ULL(rc_map->rc_type);
|
||||
+
|
||||
if (dev->change_protocol) {
|
||||
- u64 rc_type = (1ll << rc_map->rc_type);
|
||||
rc = dev->change_protocol(dev, &rc_type);
|
||||
if (rc < 0)
|
||||
goto out_raw;
|
||||
dev->enabled_protocols = rc_type;
|
||||
}
|
||||
|
||||
+ if (dev->driver_type == RC_DRIVER_IR_RAW)
|
||||
+ ir_raw_load_modules(&rc_type);
|
||||
+
|
||||
/* Allow the RC sysfs nodes to be accessible */
|
||||
atomic_set(&dev->initialized, 1);
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
Loading…
x
Reference in New Issue
Block a user