diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-11 11:24:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-11 11:24:25 -0700 |
| commit | c6c599272374a358b4171d50ffd605e6cf7b481c (patch) | |
| tree | 8ce918c724c39e88e96d7abf243955718e71da9a /include | |
| parent | ff945afb10bc9d81f395da474fa2aa88ee620e48 (diff) | |
| parent | 40d28582316d8dcb535c359a14b71cb910ad6e73 (diff) | |
| download | kernel-crypto-c6c599272374a358b4171d50ffd605e6cf7b481c.tar.gz kernel-crypto-c6c599272374a358b4171d50ffd605e6cf7b481c.tar.xz kernel-crypto-c6c599272374a358b4171d50ffd605e6cf7b481c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (32 commits)
USB: serial: no unnecessary GFP_ATOMIC in oti6858
USB: serial: fix race between unthrottle and completion handler in visor
USB: serial: fix assumption that throttle/unthrottle cannot sleep
USB: serial: fix race between unthrottle and completion handler in symbolserial
USB: serial: fix race between unthrottle and completion handler in opticon
USB: ehci: Fix isoc scheduling boundary checking.
USB: storage: When a device returns no sense data, call it a Hardware Error
USB: small fix in error case of suspend in generic usbserial code
USB: visor: fix trivial accounting bug in visor driver
USB: Fix throttling in generic usbserial driver
USB: cp210x: Add support for the DW700 UART
USB: ipaq: fix oops when device is plugged in
USB: isp1362: fix build warnings on 64-bit systems
USB: gadget: imx_udc: Use resource size
USB: storage: iRiver P7 UNUSUAL_DEV patch
USB: musb: make HAVE_CLK support optional
USB: xhci: Fix dropping endpoints from the xHC schedule.
USB: xhci: Don't wait for a disable slot cmd when HC dies.
USB: xhci: Handle canceled URBs when HC dies.
USB: xhci: Stop debugging polling loop when HC dies.
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/serial.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index c17eb64d721..ce911ebf91e 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -150,6 +150,7 @@ struct usb_serial { struct usb_interface *interface; unsigned char disconnected:1; unsigned char suspending:1; + unsigned char attached:1; unsigned char minor; unsigned char num_ports; unsigned char num_port_pointers; |