aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/class
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/class')
-rw-r--r--drivers/usb/class/cdc-acm.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index f51e22490edf..912d97aaf9bf 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -332,7 +332,7 @@ static void acm_read_bulk(struct urb *urb)
332 return; 332 return;
333 333
334 if (status) 334 if (status)
335 dev_dbg(&acm->data->dev, "bulk rx status %d", status); 335 dev_dbg(&acm->data->dev, "bulk rx status %d\n", status);
336 336
337 buf = rcv->buffer; 337 buf = rcv->buffer;
338 buf->size = urb->actual_length; 338 buf->size = urb->actual_length;
@@ -831,13 +831,13 @@ static int acm_probe (struct usb_interface *intf,
831 831
832 /* normal probing*/ 832 /* normal probing*/
833 if (!buffer) { 833 if (!buffer) {
834 err("Wierd descriptor references\n"); 834 err("Weird descriptor references\n");
835 return -EINVAL; 835 return -EINVAL;
836 } 836 }
837 837
838 if (!buflen) { 838 if (!buflen) {
839 if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) { 839 if (intf->cur_altsetting->endpoint->extralen && intf->cur_altsetting->endpoint->extra) {
840 dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint"); 840 dev_dbg(&intf->dev,"Seeking extra descriptors on endpoint\n");
841 buflen = intf->cur_altsetting->endpoint->extralen; 841 buflen = intf->cur_altsetting->endpoint->extralen;
842 buffer = intf->cur_altsetting->endpoint->extra; 842 buffer = intf->cur_altsetting->endpoint->extra;
843 } else { 843 } else {
@@ -887,24 +887,24 @@ next_desc:
887 887
888 if (!union_header) { 888 if (!union_header) {
889 if (call_interface_num > 0) { 889 if (call_interface_num > 0) {
890 dev_dbg(&intf->dev,"No union descriptor, using call management descriptor"); 890 dev_dbg(&intf->dev,"No union descriptor, using call management descriptor\n");
891 data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num)); 891 data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = call_interface_num));
892 control_interface = intf; 892 control_interface = intf;
893 } else { 893 } else {
894 dev_dbg(&intf->dev,"No union descriptor, giving up"); 894 dev_dbg(&intf->dev,"No union descriptor, giving up\n");
895 return -ENODEV; 895 return -ENODEV;
896 } 896 }
897 } else { 897 } else {
898 control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); 898 control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0);
899 data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0)); 899 data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0));
900 if (!control_interface || !data_interface) { 900 if (!control_interface || !data_interface) {
901 dev_dbg(&intf->dev,"no interfaces"); 901 dev_dbg(&intf->dev,"no interfaces\n");
902 return -ENODEV; 902 return -ENODEV;
903 } 903 }
904 } 904 }
905 905
906 if (data_interface_num != call_interface_num) 906 if (data_interface_num != call_interface_num)
907 dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported."); 907 dev_dbg(&intf->dev,"Seperate call control interface. That is not fully supported.\n");
908 908
909skip_normal_probe: 909skip_normal_probe:
910 910
@@ -912,7 +912,7 @@ skip_normal_probe:
912 if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) { 912 if (data_interface->cur_altsetting->desc.bInterfaceClass != CDC_DATA_INTERFACE_TYPE) {
913 if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) { 913 if (control_interface->cur_altsetting->desc.bInterfaceClass == CDC_DATA_INTERFACE_TYPE) {
914 struct usb_interface *t; 914 struct usb_interface *t;
915 dev_dbg(&intf->dev,"Your device has switched interfaces."); 915 dev_dbg(&intf->dev,"Your device has switched interfaces.\n");
916 916
917 t = control_interface; 917 t = control_interface;
918 control_interface = data_interface; 918 control_interface = data_interface;
@@ -927,7 +927,7 @@ skip_normal_probe:
927 return -ENODEV; 927 return -ENODEV;
928 928
929 if (usb_interface_claimed(data_interface)) { /* valid in this context */ 929 if (usb_interface_claimed(data_interface)) { /* valid in this context */
930 dev_dbg(&intf->dev,"The data interface isn't available"); 930 dev_dbg(&intf->dev,"The data interface isn't available\n");
931 return -EBUSY; 931 return -EBUSY;
932 } 932 }
933 933
@@ -944,7 +944,7 @@ skip_normal_probe:
944 if (!usb_endpoint_dir_in(epread)) { 944 if (!usb_endpoint_dir_in(epread)) {
945 /* descriptors are swapped */ 945 /* descriptors are swapped */
946 struct usb_endpoint_descriptor *t; 946 struct usb_endpoint_descriptor *t;
947 dev_dbg(&intf->dev,"The data interface has switched endpoints"); 947 dev_dbg(&intf->dev,"The data interface has switched endpoints\n");
948 948
949 t = epread; 949 t = epread;
950 epread = epwrite; 950 epread = epwrite;
@@ -959,7 +959,7 @@ skip_normal_probe:
959 } 959 }
960 960
961 if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) { 961 if (!(acm = kzalloc(sizeof(struct acm), GFP_KERNEL))) {
962 dev_dbg(&intf->dev, "out of memory (acm kzalloc)"); 962 dev_dbg(&intf->dev, "out of memory (acm kzalloc)\n");
963 goto alloc_fail; 963 goto alloc_fail;
964 } 964 }
965 965
@@ -985,26 +985,26 @@ skip_normal_probe:
985 985
986 buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma); 986 buf = usb_buffer_alloc(usb_dev, ctrlsize, GFP_KERNEL, &acm->ctrl_dma);
987 if (!buf) { 987 if (!buf) {
988 dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)"); 988 dev_dbg(&intf->dev, "out of memory (ctrl buffer alloc)\n");
989 goto alloc_fail2; 989 goto alloc_fail2;
990 } 990 }
991 acm->ctrl_buffer = buf; 991 acm->ctrl_buffer = buf;
992 992
993 if (acm_write_buffers_alloc(acm) < 0) { 993 if (acm_write_buffers_alloc(acm) < 0) {
994 dev_dbg(&intf->dev, "out of memory (write buffer alloc)"); 994 dev_dbg(&intf->dev, "out of memory (write buffer alloc)\n");
995 goto alloc_fail4; 995 goto alloc_fail4;
996 } 996 }
997 997
998 acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL); 998 acm->ctrlurb = usb_alloc_urb(0, GFP_KERNEL);
999 if (!acm->ctrlurb) { 999 if (!acm->ctrlurb) {
1000 dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)"); 1000 dev_dbg(&intf->dev, "out of memory (ctrlurb kmalloc)\n");
1001 goto alloc_fail5; 1001 goto alloc_fail5;
1002 } 1002 }
1003 for (i = 0; i < num_rx_buf; i++) { 1003 for (i = 0; i < num_rx_buf; i++) {
1004 struct acm_ru *rcv = &(acm->ru[i]); 1004 struct acm_ru *rcv = &(acm->ru[i]);
1005 1005
1006 if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) { 1006 if (!(rcv->urb = usb_alloc_urb(0, GFP_KERNEL))) {
1007 dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)"); 1007 dev_dbg(&intf->dev, "out of memory (read urbs usb_alloc_urb)\n");
1008 goto alloc_fail7; 1008 goto alloc_fail7;
1009 } 1009 }
1010 1010
@@ -1015,13 +1015,13 @@ skip_normal_probe:
1015 struct acm_rb *buf = &(acm->rb[i]); 1015 struct acm_rb *buf = &(acm->rb[i]);
1016 1016
1017 if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) { 1017 if (!(buf->base = usb_buffer_alloc(acm->dev, readsize, GFP_KERNEL, &buf->dma))) {
1018 dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)"); 1018 dev_dbg(&intf->dev, "out of memory (read bufs usb_buffer_alloc)\n");
1019 goto alloc_fail7; 1019 goto alloc_fail7;
1020 } 1020 }
1021 } 1021 }
1022 acm->writeurb = usb_alloc_urb(0, GFP_KERNEL); 1022 acm->writeurb = usb_alloc_urb(0, GFP_KERNEL);
1023 if (!acm->writeurb) { 1023 if (!acm->writeurb) {
1024 dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)"); 1024 dev_dbg(&intf->dev, "out of memory (writeurb kmalloc)\n");
1025 goto alloc_fail7; 1025 goto alloc_fail7;
1026 } 1026 }
1027 1027