diff options
Diffstat (limited to 'drivers/usb/serial/ipaq.c')
-rw-r--r-- | drivers/usb/serial/ipaq.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index 3fea9298eb15..87b11461bf11 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
@@ -571,6 +571,8 @@ static struct usb_serial_driver ipaq_device = { | |||
571 | .description = "PocketPC PDA", | 571 | .description = "PocketPC PDA", |
572 | .usb_driver = &ipaq_driver, | 572 | .usb_driver = &ipaq_driver, |
573 | .id_table = ipaq_id_table, | 573 | .id_table = ipaq_id_table, |
574 | .bulk_in_size = URBDATA_SIZE, | ||
575 | .bulk_out_size = URBDATA_SIZE, | ||
574 | .open = ipaq_open, | 576 | .open = ipaq_open, |
575 | .close = ipaq_close, | 577 | .close = ipaq_close, |
576 | .attach = ipaq_startup, | 578 | .attach = ipaq_startup, |
@@ -628,32 +630,6 @@ static int ipaq_open(struct tty_struct *tty, | |||
628 | priv->free_len += PACKET_SIZE; | 630 | priv->free_len += PACKET_SIZE; |
629 | } | 631 | } |
630 | 632 | ||
631 | /* | ||
632 | * Lose the small buffers usbserial provides. Make larger ones. | ||
633 | */ | ||
634 | |||
635 | kfree(port->bulk_in_buffer); | ||
636 | kfree(port->bulk_out_buffer); | ||
637 | /* make sure the generic serial code knows */ | ||
638 | port->bulk_out_buffer = NULL; | ||
639 | |||
640 | port->bulk_in_buffer = kmalloc(URBDATA_SIZE, GFP_KERNEL); | ||
641 | if (port->bulk_in_buffer == NULL) | ||
642 | goto enomem; | ||
643 | |||
644 | port->bulk_out_buffer = kmalloc(URBDATA_SIZE, GFP_KERNEL); | ||
645 | if (port->bulk_out_buffer == NULL) { | ||
646 | /* the buffer is useless, free it */ | ||
647 | kfree(port->bulk_in_buffer); | ||
648 | port->bulk_in_buffer = NULL; | ||
649 | goto enomem; | ||
650 | } | ||
651 | port->read_urb->transfer_buffer = port->bulk_in_buffer; | ||
652 | port->write_urb->transfer_buffer = port->bulk_out_buffer; | ||
653 | port->read_urb->transfer_buffer_length = URBDATA_SIZE; | ||
654 | port->bulk_out_size = port->write_urb->transfer_buffer_length | ||
655 | = URBDATA_SIZE; | ||
656 | |||
657 | msleep(1000*initial_wait); | 633 | msleep(1000*initial_wait); |
658 | 634 | ||
659 | /* | 635 | /* |