aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/aircable.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/aircable.c')
-rw-r--r--drivers/usb/serial/aircable.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index eec4fb9a35c1..d634e6635632 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -111,13 +111,14 @@ static int aircable_probe(struct usb_serial *serial,
111 for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) { 111 for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
112 endpoint = &iface_desc->endpoint[i].desc; 112 endpoint = &iface_desc->endpoint[i].desc;
113 if (usb_endpoint_is_bulk_out(endpoint)) { 113 if (usb_endpoint_is_bulk_out(endpoint)) {
114 dbg("found bulk out on endpoint %d", i); 114 dev_dbg(&serial->dev->dev,
115 "found bulk out on endpoint %d\n", i);
115 ++num_bulk_out; 116 ++num_bulk_out;
116 } 117 }
117 } 118 }
118 119
119 if (num_bulk_out == 0) { 120 if (num_bulk_out == 0) {
120 dbg("Invalid interface, discarding"); 121 dev_dbg(&serial->dev->dev, "Invalid interface, discarding\n");
121 return -ENODEV; 122 return -ENODEV;
122 } 123 }
123 124
@@ -133,7 +134,7 @@ static int aircable_process_packet(struct tty_struct *tty,
133 packet += HCI_HEADER_LENGTH; 134 packet += HCI_HEADER_LENGTH;
134 } 135 }
135 if (len <= 0) { 136 if (len <= 0) {
136 dbg("%s - malformed packet", __func__); 137 dev_dbg(&port->dev, "%s - malformed packet\n", __func__);
137 return 0; 138 return 0;
138 } 139 }
139 140
@@ -170,13 +171,6 @@ static void aircable_process_read_urb(struct urb *urb)
170 tty_kref_put(tty); 171 tty_kref_put(tty);
171} 172}
172 173
173static struct usb_driver aircable_driver = {
174 .name = "aircable",
175 .probe = usb_serial_probe,
176 .disconnect = usb_serial_disconnect,
177 .id_table = id_table,
178};
179
180static struct usb_serial_driver aircable_device = { 174static struct usb_serial_driver aircable_device = {
181 .driver = { 175 .driver = {
182 .owner = THIS_MODULE, 176 .owner = THIS_MODULE,
@@ -196,7 +190,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
196 &aircable_device, NULL 190 &aircable_device, NULL
197}; 191};
198 192
199module_usb_serial_driver(aircable_driver, serial_drivers); 193module_usb_serial_driver(serial_drivers, id_table);
200 194
201MODULE_AUTHOR(DRIVER_AUTHOR); 195MODULE_AUTHOR(DRIVER_AUTHOR);
202MODULE_DESCRIPTION(DRIVER_DESC); 196MODULE_DESCRIPTION(DRIVER_DESC);