korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 13:34:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: cb_das13_cs: change driver registration order

Browse Source 
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-25 15:20:53 -07:00 committed by Greg Kroah-Hartman
parent 6f47503dcc
commit 64c205f997
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/cb_das16_cs.c
View File

@ -784,11 +784,17 @@ static int __init das16cs_init(void)
{
int ret;
ret = pcmcia_register_driver(&das16cs_driver);
ret = comedi_driver_register(&driver_das16cs);
if (ret < 0)
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);