diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
| commit | 32ea89ecb25789b1b7db28146558587a42f3b372 (patch) | |
| tree | c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 /fs/sysfs/file.c | |
| parent | 58a7ce64426394a46e80cdc9440cc1e7c195e85d (diff) | |
| parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/sysfs/file.c')
| -rw-r--r-- | fs/sysfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 830f76fa098c..f1cb1ddde511 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
| @@ -183,7 +183,7 @@ fill_write_buffer(struct sysfs_buffer * buffer, const char __user * buf, size_t | |||
| 183 | return -ENOMEM; | 183 | return -ENOMEM; |
| 184 | 184 | ||
| 185 | if (count >= PAGE_SIZE) | 185 | if (count >= PAGE_SIZE) |
| 186 | count = PAGE_SIZE; | 186 | count = PAGE_SIZE - 1; |
| 187 | error = copy_from_user(buffer->page,buf,count); | 187 | error = copy_from_user(buffer->page,buf,count); |
| 188 | buffer->needs_read_fill = 1; | 188 | buffer->needs_read_fill = 1; |
| 189 | return error ? -EFAULT : count; | 189 | return error ? -EFAULT : count; |