diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /sound/oss/msnd.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'sound/oss/msnd.c')
| -rw-r--r-- | sound/oss/msnd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c index a7ad2b0a2ac0..5dbfc0f9c3c7 100644 --- a/sound/oss/msnd.c +++ b/sound/oss/msnd.c | |||
| @@ -95,10 +95,8 @@ void msnd_fifo_init(msnd_fifo *f) | |||
| 95 | 95 | ||
| 96 | void msnd_fifo_free(msnd_fifo *f) | 96 | void msnd_fifo_free(msnd_fifo *f) |
| 97 | { | 97 | { |
| 98 | if (f->data) { | 98 | vfree(f->data); |
| 99 | vfree(f->data); | 99 | f->data = NULL; |
| 100 | f->data = NULL; | ||
| 101 | } | ||
| 102 | } | 100 | } |
| 103 | 101 | ||
| 104 | int msnd_fifo_alloc(msnd_fifo *f, size_t n) | 102 | int msnd_fifo_alloc(msnd_fifo *f, size_t n) |