]> www.infradead.org Git - users/hch/misc.git/commitdiff
usb: usblp: Use min_t() to improve usblp_read()
authorThorsten Blum <thorsten.blum@linux.dev>
Fri, 29 Aug 2025 17:37:12 +0000 (19:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Sep 2025 13:20:22 +0000 (15:20 +0200)
Use min_t() to improve usblp_read() and avoid calculating
'avail - usblp->readcount' twice. Use min_t(ssize_t,,) instead of min()
to avoid a signedness error.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://lore.kernel.org/r/20250829173713.56222-1-thorsten.blum@linux.dev
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/usblp.c

index acbefccbdb2a489f6bc81c63d626f16702eecbf8..a7a1d38b6bef75fc476f015161c56db558465a07 100644 (file)
@@ -34,6 +34,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/minmax.h>
 #include <linux/sched/signal.h>
 #include <linux/signal.h>
 #include <linux/poll.h>
@@ -871,7 +872,7 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t len, lo
                goto done;
        }
 
-       count = len < avail - usblp->readcount ? len : avail - usblp->readcount;
+       count = min_t(ssize_t, len, avail - usblp->readcount);
        if (count != 0 &&
            copy_to_user(buffer, usblp->readbuf + usblp->readcount, count)) {
                count = -EFAULT;