diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /sound/oss/maestro.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'sound/oss/maestro.c')
| -rw-r--r-- | sound/oss/maestro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c index 52d2db4bc312..3dce504e6d6d 100644 --- a/sound/oss/maestro.c +++ b/sound/oss/maestro.c | |||
| @@ -2356,7 +2356,7 @@ ess_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos) | |||
| 2356 | } | 2356 | } |
| 2357 | 2357 | ||
| 2358 | rec_return_free: | 2358 | rec_return_free: |
| 2359 | if(combbuf) kfree(combbuf); | 2359 | kfree(combbuf); |
| 2360 | return ret; | 2360 | return ret; |
| 2361 | } | 2361 | } |
| 2362 | 2362 | ||