From 58a00a15d2a41d660cfe26f6902444ab3ed3b5f8 Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Thu, 26 Apr 2012 22:01:10 -0700 Subject: [PATCH] --- yaml --- r: 304499 b: refs/heads/master c: d9a861d55e0cf60829956d7c6e18b7de0b02ab92 h: refs/heads/master i: 304497: 794c5f0328d78dcbf43ec0c049ed61e9f4077de7 304495: f9af3d93deffa6ddad41fac0ef2bfb3a21f012bc v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/timed_output.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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);