diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-09-19 10:46:07 -0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-09-19 10:46:07 -0400 |
| commit | d20bbfab01802e195a50435940f7e4aa747c217c (patch) | |
| tree | 82b0007e33c083050a4e60a49dbb2f5477b4c99d /drivers/s390/block/dasd_proc.c | |
| parent | a37933c37c14b64e81c7c9cc44a5d3f5e0c91412 (diff) | |
| parent | 136333d104bd3a62d783b0ac3d0f32ac0108c5d0 (diff) | |
Merge branch 'slab/urgent' into slab/next
Diffstat (limited to 'drivers/s390/block/dasd_proc.c')
| -rw-r--r-- | drivers/s390/block/dasd_proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index 6c3c5364d082..e12989fff4ff 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c | |||
| @@ -312,14 +312,14 @@ static ssize_t dasd_stats_proc_write(struct file *file, | |||
| 312 | pr_info("The statistics have been reset\n"); | 312 | pr_info("The statistics have been reset\n"); |
| 313 | } else | 313 | } else |
| 314 | goto out_parse_error; | 314 | goto out_parse_error; |
| 315 | kfree(buffer); | 315 | vfree(buffer); |
| 316 | return user_len; | 316 | return user_len; |
| 317 | out_parse_error: | 317 | out_parse_error: |
| 318 | rc = -EINVAL; | 318 | rc = -EINVAL; |
| 319 | pr_warning("%s is not a supported value for /proc/dasd/statistics\n", | 319 | pr_warning("%s is not a supported value for /proc/dasd/statistics\n", |
| 320 | str); | 320 | str); |
| 321 | out_error: | 321 | out_error: |
| 322 | kfree(buffer); | 322 | vfree(buffer); |
| 323 | return rc; | 323 | return rc; |
| 324 | #else | 324 | #else |
| 325 | pr_warning("/proc/dasd/statistics: is not activated in this kernel\n"); | 325 | pr_warning("/proc/dasd/statistics: is not activated in this kernel\n"); |