diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 967cbda1fd72ab1aef46ff0e3f25a0cf3c952652..39b1a20a298c8ddd1bfe60627da60fbe415a5dc6 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -778,6 +778,7 @@ static int dss_driver_probe(struct device *dev)
 
 	if (r) {
 		DSSERR("driver probe failed: %d\n", r);
+		dss_uninit_device(core.pdev, dssdev);
 		return r;
 	}