Make it possible for gpio-ir-recv users to choose a map name.
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Ravi Kumar V <[email protected]>
Cc: <[email protected]>
Signed-off-by: Benoît Thébaudeau <[email protected]>
---
.../drivers/media/rc/gpio-ir-recv.c | 2 +-
.../include/media/gpio-ir-recv.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git linux-next-HEAD-6c86b58.orig/drivers/media/rc/gpio-ir-recv.c
linux-next-HEAD-6c86b58/drivers/media/rc/gpio-ir-recv.c
index b41e13c..15e346e 100644
--- linux-next-HEAD-6c86b58.orig/drivers/media/rc/gpio-ir-recv.c
+++ linux-next-HEAD-6c86b58/drivers/media/rc/gpio-ir-recv.c
@@ -93,7 +93,7 @@ static int __devinit gpio_ir_recv_probe(struct
platform_device *pdev)
rcdev->input_id.version = 0x0100;
rcdev->dev.parent = &pdev->dev;
rcdev->driver_name = GPIO_IR_DRIVER_NAME;
- rcdev->map_name = RC_MAP_EMPTY;
+ rcdev->map_name = pdata->map_name ?: RC_MAP_EMPTY;
gpio_dev->rcdev = rcdev;
gpio_dev->gpio_nr = pdata->gpio_nr;
diff --git linux-next-HEAD-6c86b58.orig/include/media/gpio-ir-recv.h
linux-next-HEAD-6c86b58/include/media/gpio-ir-recv.h
index 67797bf..91546f3 100644
--- linux-next-HEAD-6c86b58.orig/include/media/gpio-ir-recv.h
+++ linux-next-HEAD-6c86b58/include/media/gpio-ir-recv.h
@@ -16,6 +16,7 @@
struct gpio_ir_recv_platform_data {
int gpio_nr;
bool active_low;
+ const char *map_name;
};
#endif /* __GPIO_IR_RECV_H__ */
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html