|
@@ -332,7 +332,7 @@ static void acm_read_bulk(struct urb *urb)
|
|
|
return;
|
|
|
|
|
|
if (status)
|
|
|
- dev_dbg(&acm->data->dev, "bulk rx status %d", status);
|
|
|
+ dev_dbg(&acm->data->dev, "bulk rx status %d\n", status);
|
|
|
|
|
|
buf = rcv->buffer;
|
|
|
buf->size = urb->actual_length;
|
|
@@ -831,13 +831,13 @@ static int acm_probe (struct usb_interface *intf,
|
|
|
|
|
|
/* normal probing*/
|
|
|
if (!buffer) {
|
|
|
- err("Wierd descriptor references\n");
|
|
|
+ err("Weird descriptor references\n");
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
if (!buflen) {
|
|
|
if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) {
|
|
|
- dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint");
|
|
|
+ dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint\n");
|
|
|
buflen = intf->cur_altsetting->endpoint->extralen;
|
|
|
buffer = intf->cur_altsetting->endpoint->extra;
|
|
|
} else {
|
|
@@ -887,24 +887,24 @@ next_desc:
|
|
|
|
|
|
if (!union_header) {
|
|
|
if (call_interface_num > 0) {
|
|
|
- dev_dbg(&intf->dev,"No union descriptor, using call management descriptor");
|
|
|
+ dev_dbg(&intf->dev,"No union descriptor, using call management descriptor\n");
|
|
|
data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num));
|
|
|
control_interface = intf;
|
|
|
} else {
|
|
|
- dev_dbg(&intf->dev,"No union descriptor, giving up");
|
|
|
+ dev_dbg(&intf->dev,"No union descriptor, giving up\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
} else {
|
|
|
control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0);
|
|
|
data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0));
|
|
|
if (!control_interface || !data_interface) {
|
|
|
- dev_dbg(&intf->dev,"no interfaces");
|
|
|
+ dev_dbg(&intf->dev,"no interfaces\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (data_interface_num != call_interface_num)
|
|
|
- dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.");
|
|
|
+ dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.\n");
|
|
|
|
|
|
skip_normal_probe:
|
|
|
|
|
@@ -912,7 +912,7 @@ skip_normal_probe:
|
|
|
if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) {
|
|
|
if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) {
|
|
|
struct usb_interface *t;
|
|
|
- dev_dbg(&intf->dev,"Your device has switched interfaces.");
|
|
|
+ dev_dbg(&intf->dev,"Your device has switched interfaces.\n");
|
|
|
|
|
|
t = control_interface;
|
|
|
control_interface = data_interface;
|
|
@@ -927,7 +927,7 @@ skip_normal_probe:
|
|
|
return -ENODEV;
|
|
|
|
|
|
if (usb_interface_claimed(data_interface)) { /* valid in this context */
|
|
|
- dev_dbg(&intf->dev,"The data interface isn't available");
|
|
|
+ dev_dbg(&intf->dev,"The data interface isn't available\n");
|
|
|
return -EBUSY;
|
|
|
}
|
|
|
|
|
@@ -944,7 +944,7 @@ skip_normal_probe:
|
|
|
if (!usb_endpoint_dir_in(epread)) {
|
|
|
/* descriptors are swapped */
|
|
|
struct usb_endpoint_descriptor *t;
|
|
|
- dev_dbg(&intf->dev,"The data interface has switched endpoints");
|
|
|
+ dev_dbg(&intf->dev,"The data interface has switched endpoints\n");
|
|
|
|
|
|
t = epread;
|
|
|
epread = epwrite;
|
|
@@ -959,7 +959,7 @@ skip_normal_probe:
|
|
|
}
|
|
|
|
|
|
if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) {
|
|
|
- dev_dbg(&intf->dev, "out of memory (acm kzalloc)");
|
|
|
+ dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n");
|
|
|
goto alloc_fail;
|
|
|
}
|
|
|
|
|
@@ -985,26 +985,26 @@ skip_normal_probe:
|
|
|
|
|
|
buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
|
|
|
if (!buf) {
|
|
|
- dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)");
|
|
|
+ dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)\n");
|
|
|
goto alloc_fail2;
|
|
|
}
|
|
|
acm->ctrl_buffer = buf;
|
|
|
|
|
|
if (acm_write_buffers_alloc(acm) < 0) {
|
|
|
- dev_dbg(&intf->dev, "out of memory (write buffer alloc)");
|
|
|
+ dev_dbg(&intf->dev, "out of memory (write buffer alloc)\n");
|
|
|
goto alloc_fail4;
|
|
|
}
|
|
|
|
|
|
acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
if (!acm->ctrlurb) {
|
|
|
- dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)");
|
|
|
+ dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)\n");
|
|
|
goto alloc_fail5;
|
|
|
}
|
|
|
for (i = 0; i < num_rx_buf; i++) {
|
|
|
struct acm_ru *rcv = &(acm->ru[i]);
|
|
|
|
|
|
if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) {
|
|
|
- dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)");
|
|
|
+ dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)\n");
|
|
|
goto alloc_fail7;
|
|
|
}
|
|
|
|
|
@@ -1015,13 +1015,13 @@ skip_normal_probe:
|
|
|
struct acm_rb *buf = &(acm->rb[i]);
|
|
|
|
|
|
if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) {
|
|
|
- dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)");
|
|
|
+ dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n");
|
|
|
goto alloc_fail7;
|
|
|
}
|
|
|
}
|
|
|
acm->writeurb = usb_alloc_urb(0, GFP_KERNEL);
|
|
|
if (!acm->writeurb) {
|
|
|
- dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)");
|
|
|
+ dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)\n");
|
|
|
goto alloc_fail7;
|
|
|
}
|
|
|
|