[PATCH 3/3] Staging: most: replace min() by min_t()

Christian Gromm christian.gromm at microchip.com
Thu Jul 30 13:31:39 UTC 2015


This patch fixes wrong casting.

Reported-by: Dan Carpenter <dan.carpenter at oracle.com>
Signed-off-by: Christian Gromm <christian.gromm at microchip.com>
---
 drivers/staging/most/mostcore/core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/most/mostcore/core.c b/drivers/staging/most/mostcore/core.c
index 49d03af..f872dc0 100644
--- a/drivers/staging/most/mostcore/core.c
+++ b/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 devnod_buf[STRING_SIZE];
 	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(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_ch;
 	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(aim_obj->remove_link, buf, max_len);
-- 
1.7.9.5



More information about the devel mailing list