summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-22 00:27:16 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-22 00:27:16 -0700
commit4d4aaa67c871435690ce592df84a14a9b526a43b (patch)
tree129697c0bec15661fda836b7725ab1301e6ec41d
parent46f55c6342abfecafb97482a19de1db69d537f02 (diff)
Avoid type warning in comparison by making it explicit.
(The difference between two pointers is a "size_t", while MAX_LEN and the result here are "int"s).
-rw-r--r--drivers/ide/ide-proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index eff7a8ba3922..e60c5715585f 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -508,7 +508,7 @@ int proc_ide_write_settings
}
if (*p != ':')
goto parse_error;
- len = min(p - start, MAX_LEN);
+ len = min_t(int, p - start, MAX_LEN);
strncpy(name, start, min(len, MAX_LEN));
name[len] = 0;