Commit 64c205f9 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: cb_das13_cs: change driver registration order

As done with the other comedi driver types, register the
comedi_driver first then the pcmcia_driver. Also, make
sure the pcmcia_driver registration succeeds and unregister
the comedi_driver it it fails.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f47503d
...@@ -784,11 +784,17 @@ static int __init das16cs_init(void) ...@@ -784,11 +784,17 @@ static int __init das16cs_init(void)
{ {
int ret; int ret;
ret = pcmcia_register_driver(&das16cs_driver); ret = comedi_driver_register(&driver_das16cs);
if (ret < 0) if (ret < 0)
return ret; return ret;
return comedi_driver_register(&driver_das16cs); ret = pcmcia_register_driver(&das16cs_driver);
if (ret < 0) {
comedi_driver_unregister(&driver_das16cs);
return ret;
}
return 0;
} }
module_init(das16cs_init); module_init(das16cs_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment