projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'kumar/merge' into merge
[cascardo/linux.git]
/
drivers
/
usb
/
serial
/
bus.c
diff --git
a/drivers/usb/serial/bus.c
b/drivers/usb/serial/bus.c
index
7f547dc
..
ed8adb0
100644
(file)
--- a/
drivers/usb/serial/bus.c
+++ b/
drivers/usb/serial/bus.c
@@
-60,8
+60,6
@@
static int usb_serial_device_probe(struct device *dev)
retval = -ENODEV;
goto exit;
}
retval = -ENODEV;
goto exit;
}
- if (port->dev_state != PORT_REGISTERING)
- goto exit;
driver = port->serial->type;
if (driver->port_probe) {
driver = port->serial->type;
if (driver->port_probe) {
@@
-98,9
+96,6
@@
static int usb_serial_device_remove(struct device *dev)
if (!port)
return -ENODEV;
if (!port)
return -ENODEV;
- if (port->dev_state != PORT_UNREGISTERING)
- return retval;
-
device_remove_file(&port->dev, &dev_attr_port_number);
driver = port->serial->type;
device_remove_file(&port->dev, &dev_attr_port_number);
driver = port->serial->type;