[PATCH] hpet: fix uninitialized variable in hpet_register()

Clear the ht_opaque field in the hpet_register() function before searching for
a free timer to prevent the function from incorrectly assuming that the search
succeeded afterwards.

Signed-off-by: Clemens Ladisch <[email protected]>
Cc: Bob Picco <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index bc5ee99b9c23787594677fa0a5eac4364b732a0d..73e6614cdf848d66b12a79ff322830d7ac022216 100644 (file)
--- a/drivers/char/hpet.c
+++ b/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);