diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2015-03-21 02:15:32 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 13:13:13 +0100 |
| commit | 330b5e80efcace88663b93bdd5ee41013284cb52 (patch) | |
| tree | d3439665be5277959e847cdf60c46b98ae5141dd /drivers/staging/ozwpan | |
| parent | c181be7f32d168f5deb85bffc7f874a4b36daeee (diff) | |
| download | linux-330b5e80efcace88663b93bdd5ee41013284cb52.tar.bz2 | |
staging: ozwpan: implement error handling in ozwpan_init()
Errors are correctly handled in oz_cdev_register() and oz_protocol_init(),
but then they are ignored in ozwpan_init().
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ozwpan')
| -rw-r--r-- | drivers/staging/ozwpan/ozmain.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/staging/ozwpan/ozmain.c b/drivers/staging/ozwpan/ozmain.c index 7d6ef4cadf1a..74ef34815b98 100644 --- a/drivers/staging/ozwpan/ozmain.c +++ b/drivers/staging/ozwpan/ozmain.c @@ -34,11 +34,21 @@ MODULE_PARM_DESC(g_net_dev, "The device(s) to bind to; " */ static int __init ozwpan_init(void) { - oz_cdev_register(); - oz_protocol_init(g_net_dev); + int err; + + err = oz_cdev_register(); + if (err) + return err; + err = oz_protocol_init(g_net_dev); + if (err) + goto err_protocol; oz_app_enable(OZ_APPID_USB, 1); oz_apps_init(); return 0; + +err_protocol: + oz_cdev_deregister(); + return err; } /* |