diff options
| author | Oliver Neukum <oliver@neukum.org> | 2009-08-04 23:52:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-08-08 01:05:14 +0200 |
| commit | cf7fdd57f978d40ceb9a0f58a25f5cf9c84d6f33 (patch) | |
| tree | 17de519a492c4353dc65111bec683bd4f038a311 /drivers/usb/class/cdc-acm.h | |
| parent | USB: storage: include Prolific Technology USB drive in unusual_devs list (diff) | |
| download | linux-cf7fdd57f978d40ceb9a0f58a25f5cf9c84d6f33.tar.xz linux-cf7fdd57f978d40ceb9a0f58a25f5cf9c84d6f33.zip | |
USB: fix oops on disconnect in cdc-acm
This patch fixes an oops caused when during an unplug a device's table
of endpoints is zeroed before the driver is notified. A pointer to
the endpoint must be cached.
this fixes a regression caused by commit
5186ffee2320942c3dc9745f7930e0eb15329ca6
Therefore it should go into 2.6.31
Signed-off-by: Oliver Neukum <oliver@neukum.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
| -rw-r--r-- | drivers/usb/class/cdc-acm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 1602324808ba..c4a0ee8ffccf 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h @@ -126,6 +126,8 @@ struct acm { unsigned int ctrl_caps; /* control capabilities from the class specific header */ unsigned int susp_count; /* number of suspended interfaces */ int combined_interfaces:1; /* control and data collapsed */ + int is_int_ep:1; /* interrupt endpoints contrary to spec used */ + u8 bInterval; struct acm_wb *delayed_wb; /* write queued for a device about to be woken */ }; |