summaryrefslogtreecommitdiffstats
path: root/drivers/usb/acm.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-27 23:45:22 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-27 23:45:22 +0000
commit5b35aa5cd29bb111d847b2a2ed18110acbfb1f44 (patch)
treec7bbaa1137528330d3c74d14056ef7016a52be72 /drivers/usb/acm.c
parent511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff)
Merge with Linux 2.3.24.
Diffstat (limited to 'drivers/usb/acm.c')
-rw-r--r--drivers/usb/acm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/acm.c b/drivers/usb/acm.c
index 3ecea982e..a47920d00 100644
--- a/drivers/usb/acm.c
+++ b/drivers/usb/acm.c
@@ -486,8 +486,8 @@ static void acm_disconnect(struct usb_device *dev)
if (!acm->present)
return;
- printk("disconnecting\n");
-
+ acm->active=0;
+ acm->present=0;
if (acm->writing){
usb_terminate_bulk(acm->dev, acm->writetransfer);
acm->writing=0;
@@ -498,8 +498,6 @@ static void acm_disconnect(struct usb_device *dev)
}
usb_release_irq(acm->dev,acm->ctrltransfer, acm->ctrlpipe);
//BUG: What to do if a device is open?? Notify process or not allow cleanup?
- acm->active=0;
- acm->present=0;
kfree(acm->writebuffer);
kfree(acm->readbuffer);