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();