diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2009-06-02 11:54:11 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-15 21:44:47 -0700 |
| commit | c706ebdfc8955b850e477255a8c0f93f9f14712d (patch) | |
| tree | 1f880601cdd2663ee4206783092d5fa9d90c8922 /include/linux/usb | |
| parent | c6994e6f067cf0fc4c6cca3d164018b1150916f8 (diff) | |
| download | kernel_samsung_tuna-c706ebdfc8955b850e477255a8c0f93f9f14712d.zip kernel_samsung_tuna-c706ebdfc8955b850e477255a8c0f93f9f14712d.tar.gz kernel_samsung_tuna-c706ebdfc8955b850e477255a8c0f93f9f14712d.tar.bz2 | |
USB: usb-serial: call port_probe and port_remove at the right times
This patch (as1253) prevents the usb-serial core from calling a
driver's port_probe and port_remove methods more than once per port.
It also removes some unnecessary try_module_get() calls and adds a
missing port_remove method call in a failure path.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/serial.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index e29ebcf..ed4aa0f 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -27,6 +27,13 @@ /* parity check flag */ #define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK)) +enum port_dev_state { + PORT_UNREGISTERED, + PORT_REGISTERING, + PORT_REGISTERED, + PORT_UNREGISTERING, +}; + /** * usb_serial_port: structure for the specific ports of a device. * @serial: pointer back to the struct usb_serial owner of this port. @@ -102,6 +109,7 @@ struct usb_serial_port { char console; unsigned long sysrq; /* sysrq timeout */ struct device dev; + enum port_dev_state dev_state; }; #define to_usb_serial_port(d) container_of(d, struct usb_serial_port, dev) |