UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_daq_700: 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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-06-22 16:15:16 -07:00 committed by Greg Kroah-Hartman
parent 5fe9b247cc
commit f903982947
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/ni_daq_700.c
View File

@ -443,11 +443,17 @@ static int __init dio700_cs_init(void)
{
int ret;
ret = pcmcia_register_driver(&dio700_cs_driver);
ret = comedi_driver_register(&driver_dio700);
if (ret < 0)
return ret;
return comedi_driver_register(&driver_dio700);
ret = pcmcia_register_driver(&dio700_cs_driver);
if (ret < 0) {
comedi_driver_unregister(&driver_dio700);
return ret;
}
return 0;
}
module_init(dio700_cs_init);