On Thu, Apr 07, 2011 at 01:58:01PM -0700, [email protected] wrote: > > The patch below does not apply to the .38-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <[email protected]>.
Sorry, in looking at the older kernel versions, I don't think this patch is needed to be backported, so all should be fine, right? thanks, greg k-h > ------------------ original commit in Linus's tree ------------------ > > >From 2f8c4c5494c2589e6cb9a62f399e61a1c4c2378d Mon Sep 17 00:00:00 2001 > From: Arjan Mels <[email protected]> > Date: Tue, 5 Apr 2011 20:24:56 +0200 > Subject: [PATCH] staging: usbip: fix shutdown problems. > > When shuting down the tcp_rx and tcp_tx threads first check if they are > not closed already (maybe because an error caused them to return). > > Signed-off-by: Arjan Mels <[email protected]> > Cc: Takahiro Hirofuchi <[email protected]> > Cc: Max Vozeler <[email protected]> > Cc: Arnd Bergmann <[email protected]> > Cc: stable <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > diff --git a/drivers/staging/usbip/stub_dev.c > b/drivers/staging/usbip/stub_dev.c > index 8214c35..bce7d03 100644 > --- a/drivers/staging/usbip/stub_dev.c > +++ b/drivers/staging/usbip/stub_dev.c > @@ -220,8 +220,10 @@ static void stub_shutdown_connection(struct usbip_device > *ud) > } > > /* 1. stop threads */ > - kthread_stop(ud->tcp_rx); > - kthread_stop(ud->tcp_tx); > + if (ud->tcp_rx && !task_is_dead(ud->tcp_rx)) > + kthread_stop(ud->tcp_rx); > + if (ud->tcp_tx && !task_is_dead(ud->tcp_tx)) > + kthread_stop(ud->tcp_tx); > > /* 2. close the socket */ > /* _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
