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

[~andy/linux] / drivers / usb / core / message.c

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 0b5ec234c787ff907cf677c25dbf4f407a418642..b3bdfede45e68721376c381a42950044da9625ad 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -435,7 +435,7 @@ int usb_sg_init(struct usb_sg_request *io, struct usb_device *dev,
 
                        len = sg->length;
                        if (length) {
-                               len = min_t(unsigned, len, length);
+                               len = min_t(size_t, len, length);
                                length -= len;
                                if (length == 0)
                                        io->entries = i + 1;