From 3463ef1aeacebbd073ea582606d67e50f4ca3d2c Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 22 Dec 2009 17:31:23 -0300
Subject: [PATCH] --- yaml --- r: 181486 b: refs/heads/master c:
 ed0ee8e1fbab49b494ef2994be92e7832dd6673c h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/radio/si470x/radio-si470x-usb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7816d9473007..3f3c6dbcb239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0572325d23b8c89930a08e0b8b3850a6fe75d7d
+refs/heads/master: ed0ee8e1fbab49b494ef2994be92e7832dd6673c
diff --git a/trunk/drivers/media/radio/si470x/radio-si470x-usb.c b/trunk/drivers/media/radio/si470x/radio-si470x-usb.c
index a96e1b9dd646..a0a79c70dd5b 100644
--- a/trunk/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/trunk/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -590,8 +590,9 @@ int si470x_fops_release(struct file *file)
 			video_unregister_device(radio->videodev);
 			kfree(radio->int_in_buffer);
 			kfree(radio->buffer);
+			mutex_unlock(&radio->disconnect_lock);
 			kfree(radio);
-			goto unlock;
+			goto done;
 		}
 
 		/* cancel read processes */
@@ -601,7 +602,6 @@ int si470x_fops_release(struct file *file)
 		retval = si470x_stop(radio);
 		usb_autopm_put_interface(radio->intf);
 	}
-unlock:
 	mutex_unlock(&radio->disconnect_lock);
 done:
 	return retval;