patch-2.4.10 linux/drivers/usb/storage/jumpshot.c

• Lines: 27
• Date: Fri Sep 14 14:04:07 2001
• Orig file: v2.4.9/linux/drivers/usb/storage/jumpshot.c
• Orig date: Mon Aug 27 12:41:45 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/usb/storage/jumpshot.c linux/drivers/usb/storage/jumpshot.c
@@ -45,7 +45,7 @@
 
 #include <linux/sched.h>
 #include <linux/errno.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 
 extern int usb_stor_control_msg(struct us_data *us, unsigned int pipe,
 				u8 request, u8 requesttype, u16 value,
@@ -280,7 +280,7 @@
 
 	do {
                // loop, never allocate or transfer more than 64k at once (min(128k, 255*info->ssize) is the real limit)
-                len = min(int, totallen, 65536);
+                len = min_t(int, totallen, 65536);
 
                 if (use_sg) {
                         sg = (struct scatterlist *) dest;
@@ -395,7 +395,7 @@
 
 	do {
                 // loop, never allocate or transfer more than 64k at once (min(128k, 255*info->ssize) is the real limit)
-                len = min(int, totallen, 65536);
+                len = min_t(int, totallen, 65536);
 
                 if (use_sg) {
                         sg = (struct scatterlist *) src;