aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-06-04 21:57:12 +0200
committerBjørn Mork <bjorn@mork.no>2012-06-04 21:57:12 +0200
commit80f027da4acebbf46a67ee42d039f457574a8915 (patch)
tree70fb2700fa0f4e221b34109d81f14be677dc589e
parent8cdb652f68a96373ac0e58852226c80a0fb17035 (diff)
Revert "USB: cdc-wdm: add debug messages on cleanup"
This reverts commit 0c68ab1b23871bbfa1bb7e792d476e9618a749c0. Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r--drivers/usb/class/cdc-wdm.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 40a3f0b17d3..38d8c333313 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -588,12 +588,10 @@ static int wdm_release(struct inode *inode, struct file *file)
if (!desc->count) {
dev_dbg(&desc->intf->dev, "wdm_release: cleanup");
kill_urbs(desc);
- if (!test_bit(WDM_DISCONNECTING, &desc->flags)) {
+ if (!test_bit(WDM_DISCONNECTING, &desc->flags))
desc->intf->needs_remote_wakeup = 0;
- } else {
- dev_dbg(&desc->intf->dev, "%s: device gone - cleaning up\n", __func__);
+ else
cleanup(desc);
- }
}
mutex_unlock(&wdm_mutex);
return 0;
@@ -809,8 +807,6 @@ static void wdm_disconnect(struct usb_interface *intf)
mutex_unlock(&desc->rlock);
if (!desc->count)
cleanup(desc);
- else
- dev_dbg(&intf->dev, "%s: %d open files - postponing cleanup\n", __func__, desc->count);
mutex_unlock(&wdm_mutex);
}