Browse Source

Staging: most: replace min() by min_t()

This patch fixes wrong casting.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Christian Gromm 10 years ago
parent
commit
3f78f6116d
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/staging/most/mostcore/core.c

+ 2 - 2
drivers/staging/most/mostcore/core.c

@@ -973,7 +973,7 @@ static ssize_t store_add_link(struct most_aim_obj *aim_obj,
 	char *mdev_devnod;
 	char *mdev_devnod;
 	char devnod_buf[STRING_SIZE];
 	char devnod_buf[STRING_SIZE];
 	int ret;
 	int ret;
-	unsigned int max_len = min((int)len + 1, STRING_SIZE);
+	size_t max_len = min_t(size_t, len + 1, STRING_SIZE);
 
 
 	strlcpy(buffer, buf, max_len);
 	strlcpy(buffer, buf, max_len);
 	strlcpy(aim_obj->add_link, buf, max_len);
 	strlcpy(aim_obj->add_link, buf, max_len);
@@ -1036,7 +1036,7 @@ static ssize_t store_remove_link(struct most_aim_obj *aim_obj,
 	char *mdev;
 	char *mdev;
 	char *mdev_ch;
 	char *mdev_ch;
 	int ret;
 	int ret;
-	unsigned int max_len = min((int)len + 1, STRING_SIZE);
+	size_t max_len = min_t(size_t, len + 1, STRING_SIZE);
 
 
 	strlcpy(buffer, buf, max_len);
 	strlcpy(buffer, buf, max_len);
 	strlcpy(aim_obj->remove_link, buf, max_len);
 	strlcpy(aim_obj->remove_link, buf, max_len);