diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /kernel/sysctl_binary.c | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 4b2545a136ff..b875bedf7c9a 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c | |||
| @@ -1192,7 +1192,7 @@ static ssize_t bin_dn_node_address(struct file *file, | |||
| 1192 | 1192 | ||
| 1193 | buf[result] = '\0'; | 1193 | buf[result] = '\0'; |
| 1194 | 1194 | ||
| 1195 | /* Convert the decnet addresss to binary */ | 1195 | /* Convert the decnet address to binary */ |
| 1196 | result = -EIO; | 1196 | result = -EIO; |
| 1197 | nodep = strchr(buf, '.') + 1; | 1197 | nodep = strchr(buf, '.') + 1; |
| 1198 | if (!nodep) | 1198 | if (!nodep) |