diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /fs/char_dev.c | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'fs/char_dev.c')
| -rw-r--r-- | fs/char_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index 700697a72618..38f71222a552 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c | |||
| @@ -120,7 +120,7 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor, | |||
| 120 | cd->major = major; | 120 | cd->major = major; |
| 121 | cd->baseminor = baseminor; | 121 | cd->baseminor = baseminor; |
| 122 | cd->minorct = minorct; | 122 | cd->minorct = minorct; |
| 123 | strncpy(cd->name,name, 64); | 123 | strlcpy(cd->name, name, sizeof(cd->name)); |
| 124 | 124 | ||
| 125 | i = major_to_index(major); | 125 | i = major_to_index(major); |
| 126 | 126 | ||