diff --git a/[refs] b/[refs]
index ddb81d132a9d..017d841b214c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edcfdd919a1c8afbf500be0dbfa9b68f40b4c219
+refs/heads/master: 36d36b884c745c507d9b3f60eb42925749f7d758
diff --git a/trunk/drivers/media/video/tm6000/tm6000-video.c b/trunk/drivers/media/video/tm6000/tm6000-video.c
index 4db3535a6b42..436fd67b71ae 100644
--- a/trunk/drivers/media/video/tm6000/tm6000-video.c
+++ b/trunk/drivers/media/video/tm6000/tm6000-video.c
@@ -1605,8 +1605,6 @@ static int tm6000_release(struct file *file)
 	res_free(dev, fh);
 
 	if (!dev->users) {
-		int err;
-
 		tm6000_uninit_isoc(dev);
 
 		/* Stop interrupt USB pipe */