diff --git a/[refs] b/[refs]
index 4b3364b65547..3afaeb2a18a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acbaa0bf052a363de640725972563a34d61cfb82
+refs/heads/master: d9a861d55e0cf60829956d7c6e18b7de0b02ab92
diff --git a/trunk/drivers/staging/android/timed_output.c b/trunk/drivers/staging/android/timed_output.c
index f373422308e0..38d930cadad3 100644
--- a/trunk/drivers/staging/android/timed_output.c
+++ b/trunk/drivers/staging/android/timed_output.c
@@ -99,6 +99,7 @@ EXPORT_SYMBOL_GPL(timed_output_dev_register);
 
 void timed_output_dev_unregister(struct timed_output_dev *tdev)
 {
+	tdev->enable(tdev, 0);
 	device_remove_file(tdev->dev, &dev_attr_enable);
 	device_destroy(timed_output_class, MKDEV(0, tdev->index));
 	dev_set_drvdata(tdev->dev, NULL);