diff options
Diffstat (limited to 'drivers/usb/gadget/nokia.c')
-rw-r--r-- | drivers/usb/gadget/nokia.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c index 0c13ddd78bef..b5fbf1a1cb3c 100644 --- a/drivers/usb/gadget/nokia.c +++ b/drivers/usb/gadget/nokia.c | |||
@@ -104,7 +104,6 @@ static struct eth_dev *the_dev; | |||
104 | enum { | 104 | enum { |
105 | TTY_PORT_OBEX0, | 105 | TTY_PORT_OBEX0, |
106 | TTY_PORT_OBEX1, | 106 | TTY_PORT_OBEX1, |
107 | TTY_PORT_ACM, | ||
108 | TTY_PORTS_MAX, | 107 | TTY_PORTS_MAX, |
109 | }; | 108 | }; |
110 | 109 | ||
@@ -174,7 +173,6 @@ err_conf: | |||
174 | static int __init nokia_bind(struct usb_composite_dev *cdev) | 173 | static int __init nokia_bind(struct usb_composite_dev *cdev) |
175 | { | 174 | { |
176 | struct usb_gadget *gadget = cdev->gadget; | 175 | struct usb_gadget *gadget = cdev->gadget; |
177 | struct f_serial_opts *opts; | ||
178 | int status; | 176 | int status; |
179 | int cur_line; | 177 | int cur_line; |
180 | 178 | ||
@@ -209,8 +207,6 @@ static int __init nokia_bind(struct usb_composite_dev *cdev) | |||
209 | fi_acm = usb_get_function_instance("acm"); | 207 | fi_acm = usb_get_function_instance("acm"); |
210 | if (IS_ERR(fi_acm)) | 208 | if (IS_ERR(fi_acm)) |
211 | goto err_usb; | 209 | goto err_usb; |
212 | opts = container_of(fi_acm, struct f_serial_opts, func_inst); | ||
213 | opts->port_num = tty_lines[TTY_PORT_ACM]; | ||
214 | 210 | ||
215 | /* finally register the configuration */ | 211 | /* finally register the configuration */ |
216 | status = usb_add_config(cdev, &nokia_config_500ma_driver, | 212 | status = usb_add_config(cdev, &nokia_config_500ma_driver, |