| Message ID | 20180417175029.20555-1-colin.king@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [XENIAL,SRU] rfkill: fix missing return on rfkill_init | expand |
On 04/17/18 19:50, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1764810 > > An previous backport to bug LP: #1745130 overlooked adding in > an error return that was introduced by commit 6124c53edeea. Fix > this by adding in the missing return. > > Detected by CoverityScan, CID#1467925 ("Missing return statement) > > Fixes: b9a5fffbaee6 ("rfkill: Add rfkill-any LED trigger") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > net/rfkill/core.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/rfkill/core.c b/net/rfkill/core.c > index 9e43ad9..cbaba4e 100644 > --- a/net/rfkill/core.c > +++ b/net/rfkill/core.c > @@ -1358,6 +1358,7 @@ static int __init rfkill_init(void) > > error_led_trigger: > misc_deregister(&rfkill_miscdev); > + return error; > } > subsys_initcall(rfkill_init); > > Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> Good catch. This patch should be marked as "SAUCE:" since it's not a cherry-pick/backport of an upstream commit. Thanks, Kleber
Huh, sure enough ... /home/kamal/src/ubuntu/linux/xenial/net/rfkill/core.c:1361:1: warning: control reaches end of non-void function [-Wreturn-type] Acked-by: Kamal Mostafa <kamal@canonical.com> On Tue, Apr 17, 2018 at 06:50:29PM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1764810 > > An previous backport to bug LP: #1745130 overlooked adding in > an error return that was introduced by commit 6124c53edeea. Fix > this by adding in the missing return. > > Detected by CoverityScan, CID#1467925 ("Missing return statement) > > Fixes: b9a5fffbaee6 ("rfkill: Add rfkill-any LED trigger") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > net/rfkill/core.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/rfkill/core.c b/net/rfkill/core.c > index 9e43ad9..cbaba4e 100644 > --- a/net/rfkill/core.c > +++ b/net/rfkill/core.c > @@ -1358,6 +1358,7 @@ static int __init rfkill_init(void) > > error_led_trigger: > misc_deregister(&rfkill_miscdev); > + return error; > } > subsys_initcall(rfkill_init); > > -- > 2.7.4 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 17.04.2018 19:50, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1764810 > > An previous backport to bug LP: #1745130 overlooked adding in > an error return that was introduced by commit 6124c53edeea. Fix > this by adding in the missing return. > > Detected by CoverityScan, CID#1467925 ("Missing return statement) > > Fixes: b9a5fffbaee6 ("rfkill: Add rfkill-any LED trigger") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- Applied to xenial/master-next -Stefan > net/rfkill/core.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/rfkill/core.c b/net/rfkill/core.c > index 9e43ad9..cbaba4e 100644 > --- a/net/rfkill/core.c > +++ b/net/rfkill/core.c > @@ -1358,6 +1358,7 @@ static int __init rfkill_init(void) > > error_led_trigger: > misc_deregister(&rfkill_miscdev); > + return error; > } > subsys_initcall(rfkill_init); > >
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 9e43ad9..cbaba4e 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -1358,6 +1358,7 @@ static int __init rfkill_init(void) error_led_trigger: misc_deregister(&rfkill_miscdev); + return error; } subsys_initcall(rfkill_init);