From de25d3844d931257b108bd0939279188d5dcd8b7 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Fri, 24 Jun 2011 15:48:47 +0200 Subject: [PATCH] --- yaml --- r: 259986 b: refs/heads/master c: 8547d4cc2b616e4f1dafebe2c673fc986422b506 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/usbip/vhci_hcd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5daa36399beb..ad624640dce5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c88f9906c36de61a59a99e109ff04d5b0a4a29d1 +refs/heads/master: 8547d4cc2b616e4f1dafebe2c673fc986422b506 diff --git a/trunk/drivers/staging/usbip/vhci_hcd.c b/trunk/drivers/staging/usbip/vhci_hcd.c index 878b5bf3f46c..2ee97e2095b0 100644 --- a/trunk/drivers/staging/usbip/vhci_hcd.c +++ b/trunk/drivers/staging/usbip/vhci_hcd.c @@ -860,9 +860,9 @@ static void vhci_shutdown_connection(struct usbip_device *ud) } /* kill threads related to this sdev, if v.c. exists */ - if (vdev->ud.tcp_rx) + if (vdev->ud.tcp_rx && !task_is_dead(vdev->ud.tcp_rx)) kthread_stop(vdev->ud.tcp_rx); - if (vdev->ud.tcp_tx) + if (vdev->ud.tcp_tx && !task_is_dead(vdev->ud.tcp_tx)) kthread_stop(vdev->ud.tcp_tx); pr_info("stop threads\n");