diff options
Diffstat (limited to 'drivers/staging/kpc2000')
| -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) |