diff options
| author | Benjamin Romer | 2016-02-23 18:44:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-02-26 07:40:52 +0100 |
| commit | f99d3308c5490c3bf72a7d4929bb76443daa2097 (patch) | |
| tree | 7d5a04db322f1a5817c8a551eb51b096bad15543 /drivers/staging/unisys | |
| parent | staging: unisys: remove goto in get_vbus_header_info (diff) | |
| download | kernel-qcow2-linux-f99d3308c5490c3bf72a7d4929bb76443daa2097.tar.gz kernel-qcow2-linux-f99d3308c5490c3bf72a7d4929bb76443daa2097.tar.xz kernel-qcow2-linux-f99d3308c5490c3bf72a7d4929bb76443daa2097.zip | |
staging: unisys: cleanup rc -1 in create_visor_device()
Get rid of the rc = -1 initialization. Return a meaningful error on
failure in the function, or, the rc from a called function if it fails.
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys')
| -rw-r--r-- | drivers/staging/unisys/visorbus/visorbus_main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c index 0add9ffe68fd..f81da4d2e657 100644 --- a/drivers/staging/unisys/visorbus/visorbus_main.c +++ b/drivers/staging/unisys/visorbus/visorbus_main.c @@ -973,7 +973,7 @@ EXPORT_SYMBOL_GPL(visorbus_disable_channel_interrupts); static int create_visor_device(struct visor_device *dev) { - int rc = -1; + int rc; u32 chipset_bus_no = dev->chipset_bus_no; u32 chipset_dev_no = dev->chipset_dev_no; @@ -995,6 +995,7 @@ create_visor_device(struct visor_device *dev) if (!dev->periodic_work) { POSTCODE_LINUX_3(DEVICE_CREATE_FAILURE_PC, chipset_dev_no, DIAG_SEVERITY_ERR); + rc = -EINVAL; goto away; } @@ -1032,14 +1033,15 @@ create_visor_device(struct visor_device *dev) if (rc < 0) { POSTCODE_LINUX_3(DEVICE_REGISTER_FAILURE_PC, chipset_dev_no, DIAG_SEVERITY_ERR); - goto away_register; + goto away_unregister; } list_add_tail(&dev->list_all, &list_all_device_instances); return 0; -away_register: +away_unregister: device_unregister(&dev->device); + away: put_device(&dev->device); return rc; |