diff --git a/[refs] b/[refs]
index b0172ef50a8b..9040ffe58778 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af95eade68da4dfa29c5b64d79cffc9709facf00
+refs/heads/master: 7522e4ecdfdf86b9816f06d55766a6f88baa0348
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index bc5ee99b9c23..73e6614cdf84 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -587,6 +587,8 @@ int hpet_register(struct hpet_task *tp, int periodic)
 		return -EINVAL;
 	}
 
+	tp->ht_opaque = NULL;
+
 	spin_lock_irq(&hpet_task_lock);
 	spin_lock(&hpet_lock);