diff options
| author | Cheah Kok Cheong <thrust73@gmail.com> | 2017-08-03 13:14:41 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-11-06 15:13:33 +0100 |
| commit | c0cb0b8239214cabba1e6589bceae51770beae98 (patch) | |
| tree | cce0d9a07c6056ff57befe733b0629e54cb06c85 /drivers | |
| parent | 74bb9a3ac3f066e1ea5141276c70d4611b6c5ec3 (diff) | |
Staging: comedi: comedi_fops: Avoid orphaned proc entry
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 0ae406a47..57457011d 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); |