1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index a96e1b9dd646..6f60841828da 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/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;
@@ -842,9 +842,11 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
                 kfree(radio->int_in_buffer);
                 video_unregister_device(radio->videodev);
                 kfree(radio->buffer);
+                mutex_unlock(&radio->disconnect_lock);
                 kfree(radio);
+        } else {
+                mutex_unlock(&radio->disconnect_lock);
         }
-        mutex_unlock(&radio->disconnect_lock);
 }