From d62f66de8d0ce286b078310eef97e4e6726ff3d3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 6 Mar 2009 21:31:03 -0800 Subject: [PATCH] --- yaml --- r: 133543 b: refs/heads/master c: 8c209e6782ca0e3046803fc04a5ac01c8c10437a h: refs/heads/master i: 133541: b23e16d93d161d461f480cf5af83d364be1be2da 133539: a18e0b7624584e8e6c52ef663c50daf86bdbd64d 133535: 65e61491c9d1ba73b16603608f25156ca2896bfb v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 2 +- trunk/include/linux/usb.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 946453ebcbfd..b98a859cf9b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16e2e5f634f86ccda18366967c4e592eb61bc9cc +refs/heads/master: 8c209e6782ca0e3046803fc04a5ac01c8c10437a diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index adeb23fb8003..dcc87aaa8628 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -1947,7 +1947,7 @@ static void ftdi_process_read(struct work_struct *work) priv->prev_status = new_status; } - length = min(PKTSZ, urb->actual_length-packet_offset)-2; + length = min_t(u32, PKTSZ, urb->actual_length-packet_offset)-2; if (length < 0) { dev_err(&port->dev, "%s - bad packet length: %d\n", __func__, length+2); diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index db8808e05a2a..c6b2ab41b908 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -1178,7 +1178,7 @@ struct urb { void *transfer_buffer; /* (in) associated data buffer */ dma_addr_t transfer_dma; /* (in) dma addr for transfer_buffer */ u32 transfer_buffer_length; /* (in) data buffer length */ - int actual_length; /* (return) actual transfer length */ + u32 actual_length; /* (return) actual transfer length */ unsigned char *setup_packet; /* (in) setup packet (control only) */ dma_addr_t setup_dma; /* (in) dma addr for setup_packet */ int start_frame; /* (modify) start frame (ISO) */