diff --git a/drivers/video/hdmi/hdmi-core.c b/drivers/video/hdmi/hdmi-core.c
index 31d3930e5110..441ca7a7d0d0 100755
--- a/drivers/video/hdmi/hdmi-core.c
+++ b/drivers/video/hdmi/hdmi-core.c
@@ -158,6 +158,7 @@ void hdmi_unregister(struct hdmi *hdmi)
 	if(!hdmi)
 		return;
 	id = hdmi->id;
+	del_timer(&hdmi->timer);
 	flush_scheduled_work();
 	hdmi_remove_attrs(hdmi);
 	device_unregister(hdmi->dev);