This is a note to let you know that I've just added the patch titled
[media] staging: sir: fill in missing fields and fix probe
to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
staging-sir-fill-in-missing-fields-and-fix-probe.patch
and it can be found in the queue-4.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From cf9ed9aa5b0c196b796d2728218e3c06b0f42d90 Mon Sep 17 00:00:00 2001
From: Sean Young <sean@xxxxxxxx>
Date: Sat, 25 Mar 2017 07:31:57 -0300
Subject: [media] staging: sir: fill in missing fields and fix probe
From: Sean Young <sean@xxxxxxxx>
commit cf9ed9aa5b0c196b796d2728218e3c06b0f42d90 upstream.
Some fields are left blank.
Signed-off-by: Sean Young <sean@xxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/media/lirc/lirc_sir.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -227,6 +227,7 @@ static int init_chrdev(void)
if (!rcdev)
return -ENOMEM;
+ rcdev->input_name = "SIR IrDA port";
rcdev->input_phys = KBUILD_MODNAME "/input0";
rcdev->input_id.bustype = BUS_HOST;
rcdev->input_id.vendor = 0x0001;
@@ -234,6 +235,7 @@ static int init_chrdev(void)
rcdev->input_id.version = 0x0100;
rcdev->tx_ir = sir_tx_ir;
rcdev->allowed_protocols = RC_BIT_ALL_IR_DECODER;
+ rcdev->driver_name = KBUILD_MODNAME;
rcdev->map_name = RC_MAP_RC6_MCE;
rcdev->timeout = IR_DEFAULT_TIMEOUT;
rcdev->dev.parent = &sir_ir_dev->dev;
@@ -740,7 +742,13 @@ static int init_sir_ir(void)
static int sir_ir_probe(struct platform_device *dev)
{
- return 0;
+ int retval;
+
+ retval = init_chrdev();
+ if (retval < 0)
+ return retval;
+
+ return init_sir_ir();
}
static int sir_ir_remove(struct platform_device *dev)
@@ -780,18 +788,8 @@ static int __init sir_ir_init(void)
goto pdev_add_fail;
}
- retval = init_chrdev();
- if (retval < 0)
- goto fail;
-
- retval = init_sir_ir();
- if (retval)
- goto fail;
-
return 0;
-fail:
- platform_device_del(sir_ir_dev);
pdev_add_fail:
platform_device_put(sir_ir_dev);
pdev_alloc_fail:
Patches currently in stable-queue which might be from sean@xxxxxxxx are
queue-4.11/staging-sir-fill-in-missing-fields-and-fix-probe.patch