summaryrefslogtreecommitdiff
path: root/sound/oss/maestro.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 03:38:58 (GMT)
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 03:38:58 (GMT)
commit5696c1944a33b4434a9a1ebb6383b906afd43a10 (patch)
tree16fbe6ba431bcf949ee8645510b0c2fd39b5810f /sound/oss/maestro.c
parent66b04a80eea60cabf9d89fd34deb3234a740052f (diff)
parent020f46a39eb7b99a575b9f4d105fce2b142acdf1 (diff)
downloadlinux-fsl-qoriq-5696c1944a33b4434a9a1ebb6383b906afd43a10.tar.xz
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'sound/oss/maestro.c')
-rw-r--r--sound/oss/maestro.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c
index 52d2db4..3dce504 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)
}
rec_return_free:
- if(combbuf) kfree(combbuf);
+ kfree(combbuf);
return ret;
}