diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-06-22 16:15:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 20:55:04 -0700 |
| commit | f90398294753b3f88570af1c2a68032f6ae6bfbe (patch) | |
| tree | ccc3294c92102c806afcf2bd6a37bb697c2f81be /drivers | |
| parent | 5fe9b247cc5dd6d39d9252fc0b51700e438a65fd (diff) | |
| download | linux-f90398294753b3f88570af1c2a68032f6ae6bfbe.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index b06792b3a70c..af4f10fd15df 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -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); |