drivers/usb/storage: use min() instead of min_t()

min_t(unsigned int, a, b) casts an 'unsigned long' to 'unsigned int'.
Use min(a, b) instead as it promotes any 'unsigned int' to 'unsigned long'
and so cannot discard significant bits.

In this case the 'unsigned long' value is small enough that the result
is ok.

Detected by an extra check added to min_t().

Signed-off-by: David Laight <david.laight.linux@gmail.com>
Link: https://patch.msgid.link/20251119224140.8616-29-david.laight.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
index 9033e505db7f5372069bea4751776dcca5f07e42..0cff54ad90faffa8e9a047429f07643d39288fd3 100644 (file)
--- a/drivers/usb/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
@@ -139,8 +139,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,
                return cnt;
 
        while (sg_miter_next(&miter) && cnt < buflen) {
-               unsigned int len = min_t(unsigned int, miter.length,
-                               buflen - cnt);
+               unsigned int len = min(miter.length, buflen - cnt);
 
                if (dir == FROM_XFER_BUF)
                        memcpy(buffer + cnt, miter.addr, len);