diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-21 13:38:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 13:38:42 -0700 |
| commit | 033b1142f4bd44a116d1356fe4a0510437ceddf9 (patch) | |
| tree | d2a971a7dc9f3a1af8035e38419c4c4ad8c22632 /fs/libfs.c | |
| parent | f5caadbb3d8fc0b71533e880c684b2230bdb76ac (diff) | |
| parent | e6625fa48e6580a74b7e700efd7e6463e282810b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'fs/libfs.c')
| -rw-r--r-- | fs/libfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/libfs.c b/fs/libfs.c index c88eab55aec..275ca4749a2 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -822,7 +822,7 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf, goto out; attr->set_buf[size] = '\0'; - val = simple_strtol(attr->set_buf, NULL, 0); + val = simple_strtoll(attr->set_buf, NULL, 0); ret = attr->set(attr->data, val); if (ret == 0) ret = len; /* on success, claim we got the whole input */ |