* [PATCH 3.10.y] Staging: comedi: comedi_fops: Avoid orphaned proc entry
@ 2017-08-03 12:14 Ian Abbott
2017-08-03 12:16 ` Willy Tarreau
0 siblings, 1 reply; 2+ messages in thread
From: Ian Abbott @ 2017-08-03 12:14 UTC (permalink / raw)
To: stable; +Cc: Cheah Kok Cheong, Greg Kroah-Hartman
From: Cheah Kok Cheong <thrust73@gmail.com>
commit bf279ece37d2a3eaaa9813fcd7a1d8a81eb29c20 upstream.
Move comedi_proc_init to the end to avoid orphaned proc entry
if module loading failed.
Signed-off-by: Cheah Kok Cheong <thrust73@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/comedi/comedi_fops.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 0ae406a47507..57457011ded3 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2557,9 +2557,6 @@ static int __init comedi_init(void)
comedi_class->dev_attrs = comedi_dev_attrs;
- /* XXX requires /proc interface */
- comedi_proc_init();
-
/* create devices files for legacy/manual use */
for (i = 0; i < comedi_num_legacy_minors; i++) {
struct comedi_device *dev;
@@ -2576,6 +2573,9 @@ static int __init comedi_init(void)
}
}
+ /* XXX requires /proc interface */
+ comedi_proc_init();
+
return 0;
}
module_init(comedi_init);
--
2.13.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 3.10.y] Staging: comedi: comedi_fops: Avoid orphaned proc entry
2017-08-03 12:14 [PATCH 3.10.y] Staging: comedi: comedi_fops: Avoid orphaned proc entry Ian Abbott
@ 2017-08-03 12:16 ` Willy Tarreau
0 siblings, 0 replies; 2+ messages in thread
From: Willy Tarreau @ 2017-08-03 12:16 UTC (permalink / raw)
To: Ian Abbott; +Cc: stable, Cheah Kok Cheong, Greg Kroah-Hartman
On Thu, Aug 03, 2017 at 01:14:41PM +0100, Ian Abbott wrote:
> From: Cheah Kok Cheong <thrust73@gmail.com>
>
> commit bf279ece37d2a3eaaa9813fcd7a1d8a81eb29c20 upstream.
>
> Move comedi_proc_init to the end to avoid orphaned proc entry
> if module loading failed.
(...)
now queued for 3.10.108, thank you Ian.
willy
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-03 12:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-03 12:14 [PATCH 3.10.y] Staging: comedi: comedi_fops: Avoid orphaned proc entry Ian Abbott
2017-08-03 12:16 ` Willy Tarreau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).