diff options
| author | Omar Ramirez Luna <omar.ramirez@ti.com> | 2012-01-30 19:20:18 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-08 14:14:14 -0800 |
| commit | 44c5435064b5e6182167b40a7f259969dbcaf1b8 (patch) | |
| tree | c01a542d1d9049b049ab7408aa907c730eafabec /drivers/staging | |
| parent | 5a63177a6967698df58c6c93d0db3a3586e0b028 (diff) | |
| download | linux-44c5435064b5e6182167b40a7f259969dbcaf1b8.tar.gz linux-44c5435064b5e6182167b40a7f259969dbcaf1b8.tar.bz2 linux-44c5435064b5e6182167b40a7f259969dbcaf1b8.zip | |
staging: tidspbridge: fix incorrect free to drv_datap
This structure is still used after it has been freed, since it
is being allocated in probe, calls to free it have been moved to
module's remove routine.
This should fix the follwoing messages when attempting to remove the
module:
drv_get_first_dev_extension: Failed to retrieve the object handle
drv_get_first_dev_extension: Failed to retrieve the object handle
drv_destroy: Failed to store DRV object
mgr_destroy: Failed to store MGR object
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/tidspbridge/core/tiomap3430.c | 2 | ||||
| -rw-r--r-- | drivers/staging/tidspbridge/rmgr/drv_interface.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c index e1c4492a7105..dde559d06c43 100644 --- a/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/drivers/staging/tidspbridge/core/tiomap3430.c @@ -1046,8 +1046,6 @@ static int bridge_dev_destroy(struct bridge_dev_context *dev_ctxt) /* Free the driver's device context: */ kfree(drv_datap->base_img); - kfree(drv_datap); - dev_set_drvdata(bridge, NULL); kfree((void *)dev_ctxt); return status; } diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c index 8bac511c627f..385740bad0de 100644 --- a/drivers/staging/tidspbridge/rmgr/drv_interface.c +++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c @@ -410,6 +410,9 @@ static int __devexit omap34_xx_bridge_remove(struct platform_device *pdev) DBC_ASSERT(ret == true); } + kfree(drv_datap); + dev_set_drvdata(bridge, NULL); + func_cont: mem_ext_phys_pool_release(); |