diff options
author | Oliver Neukum <oneukum@suse.de> | 2007-02-26 09:43:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-03-09 22:52:24 -0500 |
commit | c744f99eb662b54488304b8b60e5f4323b7587bf (patch) | |
tree | b3745cff1de2041c3c8e9c4c21731ab8ab12d082 /drivers/usb/serial/usb-serial.c | |
parent | cf0cb1ae0273f0963a5d54c7ec4dde384863fac8 (diff) |
USB: fix usb-serial device naming bug
Am Montag, 26. Februar 2007 15:16 schrieb Craig Schlenter:
> Hi Greg
>
> 34ef50e5b1f96c2d8c0f3d28b7d407743806256c is definitely
> the source of the problem. Reverting that makes the
> ftdi port show up as ttyUSB0 again for me and it
> can actually be opened.
This patch should fix the issue.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Craig Schlenter <craig@codefountain.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 7f93abdac994..9dbd1fa84e88 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -827,7 +827,6 @@ int usb_serial_probe(struct usb_interface *interface, | |||
827 | num_ports = type->num_ports; | 827 | num_ports = type->num_ports; |
828 | } | 828 | } |
829 | 829 | ||
830 | serial->minor = minor; | ||
831 | serial->num_ports = num_ports; | 830 | serial->num_ports = num_ports; |
832 | serial->num_bulk_in = num_bulk_in; | 831 | serial->num_bulk_in = num_bulk_in; |
833 | serial->num_bulk_out = num_bulk_out; | 832 | serial->num_bulk_out = num_bulk_out; |
@@ -981,6 +980,7 @@ int usb_serial_probe(struct usb_interface *interface, | |||
981 | dev_err(&interface->dev, "No more free serial devices\n"); | 980 | dev_err(&interface->dev, "No more free serial devices\n"); |
982 | goto probe_error; | 981 | goto probe_error; |
983 | } | 982 | } |
983 | serial->minor = minor; | ||
984 | 984 | ||
985 | /* register all of the individual ports with the driver core */ | 985 | /* register all of the individual ports with the driver core */ |
986 | for (i = 0; i < num_ports; ++i) { | 986 | for (i = 0; i < num_ports; ++i) { |