diff options
Diffstat (limited to 'drivers/usb/serial/bus.c')
-rw-r--r-- | drivers/usb/serial/bus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c index 3c4db6d196c6..f053b302a00d 100644 --- a/drivers/usb/serial/bus.c +++ b/drivers/usb/serial/bus.c | |||
@@ -43,7 +43,7 @@ static ssize_t show_port_number(struct device *dev, | |||
43 | { | 43 | { |
44 | struct usb_serial_port *port = to_usb_serial_port(dev); | 44 | struct usb_serial_port *port = to_usb_serial_port(dev); |
45 | 45 | ||
46 | return sprintf(buf, "%d\n", port->number - port->serial->minor); | 46 | return sprintf(buf, "%d\n", port->port_number); |
47 | } | 47 | } |
48 | 48 | ||
49 | static DEVICE_ATTR(port_number, S_IRUGO, show_port_number, NULL); | 49 | static DEVICE_ATTR(port_number, S_IRUGO, show_port_number, NULL); |
@@ -80,7 +80,7 @@ static int usb_serial_device_probe(struct device *dev) | |||
80 | goto exit_with_autopm; | 80 | goto exit_with_autopm; |
81 | } | 81 | } |
82 | 82 | ||
83 | minor = port->number; | 83 | minor = port->minor; |
84 | tty_register_device(usb_serial_tty_driver, minor, dev); | 84 | tty_register_device(usb_serial_tty_driver, minor, dev); |
85 | dev_info(&port->serial->dev->dev, | 85 | dev_info(&port->serial->dev->dev, |
86 | "%s converter now attached to ttyUSB%d\n", | 86 | "%s converter now attached to ttyUSB%d\n", |
@@ -106,7 +106,7 @@ static int usb_serial_device_remove(struct device *dev) | |||
106 | /* make sure suspend/resume doesn't race against port_remove */ | 106 | /* make sure suspend/resume doesn't race against port_remove */ |
107 | usb_autopm_get_interface(port->serial->interface); | 107 | usb_autopm_get_interface(port->serial->interface); |
108 | 108 | ||
109 | minor = port->number; | 109 | minor = port->minor; |
110 | tty_unregister_device(usb_serial_tty_driver, minor); | 110 | tty_unregister_device(usb_serial_tty_driver, minor); |
111 | 111 | ||
112 | device_remove_file(&port->dev, &dev_attr_port_number); | 112 | device_remove_file(&port->dev, &dev_attr_port_number); |