diff options
| author |   Jeremy Sowden <jeremy@azazel.net> | 2019-05-15 12:14:37 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-20 07:40:41 +0200 |
| commit | 70eb40836ca4a465adc7f986454fe69a2474e14e (patch) | |
| tree | a2e12c18563b70ef4bbe907a770dbb101864e727 | |
| parent | staging: kpc2000: added missing clean-up to probe_core_uio. (diff) | |
| download | linux-dev-70eb40836ca4a465adc7f986454fe69a2474e14e.tar.xz linux-dev-70eb40836ca4a465adc7f986454fe69a2474e14e.zip | |
staging: kpc2000: clean up after probe failure.
On error, kp2000_probe_cores just returned an error without freeing
resources which had previously been allocated. Added the missing
clean-up code.
Updated TODO.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/kpc2000/TODO | 1 | ||||
| -rw-r--r-- | drivers/staging/kpc2000/kpc2000/cell_probe.c | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/staging/kpc2000/TODO b/drivers/staging/kpc2000/TODO index ed951acc829a..669fe5bf9637 100644 --- a/drivers/staging/kpc2000/TODO +++ b/drivers/staging/kpc2000/TODO @@ -1,7 +1,6 @@ - the kpc_spi driver doesn't seem to let multiple transactions (to different instances of the core) happen in parallel... - The kpc_i2c driver is a hot mess, it should probably be cleaned up a ton. It functions against current hardware though. - pcard->card_num in kp2000_pcie_probe() is a global variable and needs atomic / locking / something better. -- the loop in kp2000_probe_cores() that uses probe_core_uio() also probably needs error handling - would be nice if the AIO fileops in kpc_dma could be made to work - probably want to add a CONFIG_ option to control compilation of the AIO functions - if the AIO fileops in kpc_dma start working, next would be making iov_count > 1 work too diff --git a/drivers/staging/kpc2000/kpc2000/cell_probe.c b/drivers/staging/kpc2000/kpc2000/cell_probe.c index e4c21291fe16..bce2bf9eee04 100644 --- a/drivers/staging/kpc2000/kpc2000/cell_probe.c +++ b/drivers/staging/kpc2000/kpc2000/cell_probe.c @@ -438,7 +438,7 @@ int kp2000_probe_cores(struct kp2000_device *pcard) dev_err(&pcard->pdev->dev, "kp2000_probe_cores: failed to add core %d: %d\n", i, err); - return err; + goto error; } core_num++; } @@ -457,10 +457,15 @@ int kp2000_probe_cores(struct kp2000_device *pcard) err = probe_core_uio(0, pcard, "kpc_uio", cte); if (err){ dev_err(&pcard->pdev->dev, "kp2000_probe_cores: failed to add board_info core: %d\n", err); - return err; + goto error; } return 0; + +error: + kp2000_remove_cores(pcard); + mfd_remove_devices(PCARD_TO_DEV(pcard)); + return err; } void kp2000_remove_cores(struct kp2000_device *pcard) |