From b6cfeed8699a546ea9f43cd2acb3899f52ee5c10 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Thu, 19 Mar 2009 16:53:32 -0300
Subject: [PATCH] --- yaml --- r: 138367 b: refs/heads/master c:
 e4129a9ccea54e8f4fbc408476120059809a4627 h: refs/heads/master i:   138365:
 8021db289e00415eacd5de6e4a1a27519d5030bf   138363:
 27a8b5a2acb883357ba2950ffd8fc240ffd230c5   138359:
 e251818abc732c77fee2bed096c276bb0377c2a2   138351:
 b9f2256d13951c8629a888b4987eac741e8b0a91   138335:
 6d7e685b72044c8c2514034904c1212598b9f93c   138303:
 7b5a21a1cab0f32654833649b2135d0533a14c1c   138239:
 d81b1198dfc83d73aa2885c4043bb341e4d4b586 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/media/video/tvaudio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 77c4d84a054c..5f8632e311d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 411674fd189abe5910ea4caf08b7eac5c4a4d967
+refs/heads/master: e4129a9ccea54e8f4fbc408476120059809a4627
diff --git a/trunk/drivers/media/video/tvaudio.c b/trunk/drivers/media/video/tvaudio.c
index 8333efab8685..226bf3565ac9 100644
--- a/trunk/drivers/media/video/tvaudio.c
+++ b/trunk/drivers/media/video/tvaudio.c
@@ -2050,6 +2050,7 @@ static int tvaudio_probe(struct i2c_client *client, const struct i2c_device_id *
 	}
 
 	chip->thread = NULL;
+	init_timer(&chip->wt);
 	if (desc->flags & CHIP_NEED_CHECKMODE) {
 		if (!desc->getmode || !desc->setmode) {
 			/* This shouldn't be happen. Warn user, but keep working
@@ -2059,7 +2060,6 @@ static int tvaudio_probe(struct i2c_client *client, const struct i2c_device_id *
 			return 0;
 		}
 		/* start async thread */
-		init_timer(&chip->wt);
 		chip->wt.function = chip_thread_wake;
 		chip->wt.data     = (unsigned long)chip;
 		chip->thread = kthread_run(chip_thread, chip, client->name);