--- x/drivers/media/usb/pvrusb2/pvrusb2-context.c
+++ y/drivers/media/usb/pvrusb2/pvrusb2-context.c
@@ -26,6 +26,8 @@ static int pvr2_context_cleanup_flag;
 static int pvr2_context_cleaned_flag;
 static struct task_struct *pvr2_context_thread_ptr;
 
+static DEFINE_MUTEX(pvr2_disconn_mutex);
+static int pvr2_context_cleaning;
 
 static void pvr2_context_set_notify(struct pvr2_context *mp, int fl)
 {
@@ -152,6 +154,9 @@ static int pvr2_context_thread_func(void
 
 	pvr2_trace(PVR2_TRACE_CTXT,"pvr2_context thread start");
 
+	mutex_lock(&pvr2_disconn_mutex);
+	pvr2_context_cleaning = 1;
+	mutex_unlock(&pvr2_disconn_mutex);
 	do {
 		while ((mp = pvr2_context_notify_first) != NULL) {
 			pvr2_context_set_notify(mp, 0);
@@ -163,6 +168,9 @@ static int pvr2_context_thread_func(void
 			 pvr2_context_shutok()));
 	} while (!pvr2_context_shutok());
 
+	mutex_lock(&pvr2_disconn_mutex);
+	pvr2_context_cleaning = 0;
+	mutex_unlock(&pvr2_disconn_mutex);
 	pvr2_context_cleaned_flag = !0;
 	wake_up(&pvr2_context_cleanup_data);
 
@@ -266,9 +274,14 @@ static void pvr2_context_exit(struct pvr
 
 void pvr2_context_disconnect(struct pvr2_context *mp)
 {
+	mutex_lock(&pvr2_disconn_mutex);
+	if (pvr2_context_cleaning)
+		goto out;
 	pvr2_hdw_disconnect(mp->hdw);
 	mp->disconnect_flag = !0;
 	pvr2_context_notify(mp);
+out:
+	mutex_unlock(&pvr2_disconn_mutex);
 }