From 8d1c3c0c8c314d5d7b390bd978f4639d43464ffd Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Sat, 27 Feb 2010 20:57:12 +0100 Subject: [PATCH] --- yaml --- r: 188777 b: refs/heads/master c: 338124c1f18c2c737656ac58735f040d90b23d8c h: refs/heads/master i: 188775: 874434de788962d5bf156f03b4d4641d8f9fe3b0 v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-wdm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9b3ccc3250c9..74faee5d3244 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d93d16e9aa58887feadd999ea26b7b8139e98b56 +refs/heads/master: 338124c1f18c2c737656ac58735f040d90b23d8c diff --git a/trunk/drivers/usb/class/cdc-wdm.c b/trunk/drivers/usb/class/cdc-wdm.c index b57490508860..189141ca4e05 100644 --- a/trunk/drivers/usb/class/cdc-wdm.c +++ b/trunk/drivers/usb/class/cdc-wdm.c @@ -839,10 +839,10 @@ static int wdm_resume(struct usb_interface *intf) int rv; dev_dbg(&desc->intf->dev, "wdm%d_resume\n", intf->minor); - mutex_lock(&desc->lock); + clear_bit(WDM_SUSPENDING, &desc->flags); rv = recover_from_urb_loss(desc); - mutex_unlock(&desc->lock); + return rv; } #endif