From 928e55139b4190944b5c791813ffc9d665b6b3e4 Mon Sep 17 00:00:00 2001 From: Perceval Anichini Date: Mon, 5 Jul 2010 15:11:51 -0300 Subject: [PATCH] --- yaml --- r: 202057 b: refs/heads/master c: 07204aea1454db404141e95fc124536a6e0f6aa0 h: refs/heads/master i: 202055: 5bf09c5b14208926cf80cebbe49f3b9e5b27910a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/hdpvr/hdpvr-core.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 68127ef384a1..de926d853830 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe85ce90abae7f7876a9ae8f76649586fe73d5a2 +refs/heads/master: 07204aea1454db404141e95fc124536a6e0f6aa0 diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-core.c b/trunk/drivers/media/video/hdpvr/hdpvr-core.c index 830d47b05e1d..0cae5b82e1a2 100644 --- a/trunk/drivers/media/video/hdpvr/hdpvr-core.c +++ b/trunk/drivers/media/video/hdpvr/hdpvr-core.c @@ -286,6 +286,8 @@ static int hdpvr_probe(struct usb_interface *interface, goto error; } + dev->workqueue = 0; + /* register v4l2_device early so it can be used for printks */ if (v4l2_device_register(&interface->dev, &dev->v4l2_dev)) { err("v4l2_device_register failed"); @@ -380,6 +382,9 @@ static int hdpvr_probe(struct usb_interface *interface, error: if (dev) { + /* Destroy single thread */ + if (dev->workqueue) + destroy_workqueue(dev->workqueue); /* this frees allocated memory */ hdpvr_delete(dev); }