From 6d7e685b72044c8c2514034904c1212598b9f93c Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Thu, 26 Mar 2009 20:56:06 -0300
Subject: [PATCH] --- yaml --- r: 138335 b: refs/heads/master c:
 48f98f7557d35d360470bf6d9fd7b00d04fba828 h: refs/heads/master i:   138333:
 acfa12b2fde1baaab0cc78cab9296dc2461cb7a9   138331:
 13e3ff4d6b83fdf7885d1d60ecbec6b2fe0715cd   138327:
 afd17c6cd3b9f3a325c4900e285b7a92168b4edb   138319:
 33c7975b857219e783f521455d899ca2d53e1445   138303:
 7b5a21a1cab0f32654833649b2135d0533a14c1c v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/hdpvr/hdpvr-core.c  | 2 ++
 trunk/drivers/media/video/hdpvr/hdpvr-video.c | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cdb035a2cbd2..65d13cd97841 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2ff3ec81628cbf9470c496b3d0c0780165643f5
+refs/heads/master: 48f98f7557d35d360470bf6d9fd7b00d04fba828
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-core.c b/trunk/drivers/media/video/hdpvr/hdpvr-core.c
index 2c49862b6d32..547833eb6cec 100644
--- a/trunk/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/trunk/drivers/media/video/hdpvr/hdpvr-core.c
@@ -390,8 +390,10 @@ static void hdpvr_disconnect(struct usb_interface *interface)
 	video_unregister_device(dev->video_dev);
 	wake_up_interruptible(&dev->wait_data);
 	wake_up_interruptible(&dev->wait_buffer);
+	mutex_unlock(&dev->io_mutex);
 	msleep(100);
 	flush_workqueue(dev->workqueue);
+	mutex_lock(&dev->io_mutex);
 	hdpvr_cancel_queue(dev);
 	destroy_workqueue(dev->workqueue);
 	mutex_unlock(&dev->io_mutex);
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-video.c b/trunk/drivers/media/video/hdpvr/hdpvr-video.c
index e9078cdedb28..2fe57303c0b5 100644
--- a/trunk/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/trunk/drivers/media/video/hdpvr/hdpvr-video.c
@@ -300,12 +300,14 @@ static int hdpvr_stop_streaming(struct hdpvr_device *dev)
 
 	dev->status = STATUS_SHUTTING_DOWN;
 	hdpvr_config_call(dev, CTRL_STOP_STREAMING_VALUE, 0x00);
+	mutex_unlock(&dev->io_mutex);
 
 	wake_up_interruptible(&dev->wait_buffer);
 	msleep(50);
 
 	flush_workqueue(dev->workqueue);
 
+	mutex_lock(&dev->io_mutex);
 	/* kill the still outstanding urbs */
 	hdpvr_cancel_queue(dev);
 
@@ -1130,7 +1132,7 @@ static int vidioc_encoder_cmd(struct file *filp, void *priv,
 	default:
 		v4l2_dbg(MSG_INFO, hdpvr_debug, dev->video_dev,
 			 "Unsupported encoder cmd %d\n", a->cmd);
-		return -EINVAL;
+		res = -EINVAL;
 	}
 	mutex_unlock(&dev->io_mutex);
 	return res;