Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / usb / serial / io_edgeport.c

diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index abf095b..2ee8075 100644 (file)
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -3042,7 +3042,7 @@ static int edge_startup(struct usb_serial *serial)
 
                        endpoint = &serial->interface->altsetting[0].
                                                        endpoint[i].desc;
-                       buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
+                       buffer_size = usb_endpoint_maxp(endpoint);
                        if (!interrupt_in_found &&
                            (usb_endpoint_is_int_in(endpoint))) {
                                /* we found a interrupt in endpoint */
@@ -3107,7 +3107,7 @@ static int edge_startup(struct usb_serial *serial)
                                        usb_rcvbulkpipe(dev,
                                                endpoint->bEndpointAddress),
                                        edge_serial->bulk_in_buffer,
-                                       le16_to_cpu(endpoint->wMaxPacketSize),
+                                       usb_endpoint_maxp(endpoint),
                                        edge_bulk_in_callback,
                                        edge_serial);
                                bulk_in_found = true;