diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-07 00:31:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:20:36 -0400 |
commit | 8c209e6782ca0e3046803fc04a5ac01c8c10437a (patch) | |
tree | 66a21c37659ac73e4fe993d79e2f8db64ee18254 /drivers/usb/serial/ftdi_sio.c | |
parent | 16e2e5f634f86ccda18366967c4e592eb61bc9cc (diff) |
USB: make actual_length in struct urb field u32
actual_length should also be a u32 and not a signed value. This patch
changes this field to be 'u32' to prevent any potential negative
conversion and comparison errors.
This triggered a few compiler warning messages when these fields were
being used with the min macro, so they have also been fixed up in this
patch.
Cc: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index adeb23fb8003..dcc87aaa8628 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -1947,7 +1947,7 @@ static void ftdi_process_read(struct work_struct *work) | |||
1947 | priv->prev_status = new_status; | 1947 | priv->prev_status = new_status; |
1948 | } | 1948 | } |
1949 | 1949 | ||
1950 | length = min(PKTSZ, urb->actual_length-packet_offset)-2; | 1950 | length = min_t(u32, PKTSZ, urb->actual_length-packet_offset)-2; |
1951 | if (length < 0) { | 1951 | if (length < 0) { |
1952 | dev_err(&port->dev, "%s - bad packet length: %d\n", | 1952 | dev_err(&port->dev, "%s - bad packet length: %d\n", |
1953 | __func__, length+2); | 1953 | __func__, length+2); |