Commit a20a9dee authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 649f71c5 4d4aaa67
...@@ -508,7 +508,7 @@ int proc_ide_write_settings ...@@ -508,7 +508,7 @@ int proc_ide_write_settings
} }
if (*p != ':') if (*p != ':')
goto parse_error; goto parse_error;
len = min(p - start, MAX_LEN); len = min_t(int, p - start, MAX_LEN);
strncpy(name, start, min(len, MAX_LEN)); strncpy(name, start, min(len, MAX_LEN));
name[len] = 0; name[len] = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment