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/dmasound | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'sound/oss/dmasound')
| -rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index a8636adef2e6..c8e210326893 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
| @@ -2798,7 +2798,7 @@ __init setup_beep(void) | |||
| 2798 | DBDMA_ALIGN(beep_dbdma_cmd_space); | 2798 | DBDMA_ALIGN(beep_dbdma_cmd_space); |
| 2799 | /* set up emergency dbdma cmd */ | 2799 | /* set up emergency dbdma cmd */ |
| 2800 | emergency_dbdma_cmd = beep_dbdma_cmd+1 ; | 2800 | emergency_dbdma_cmd = beep_dbdma_cmd+1 ; |
| 2801 | beep_buf = (short *) kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL); | 2801 | beep_buf = kmalloc(BEEP_BUFLEN * 4, GFP_KERNEL); |
| 2802 | if (beep_buf == NULL) { | 2802 | if (beep_buf == NULL) { |
| 2803 | printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n"); | 2803 | printk(KERN_ERR "dmasound_pmac: no memory for beep buffer\n"); |
| 2804 | kfree(beep_dbdma_cmd_space) ; | 2804 | kfree(beep_dbdma_cmd_space) ; |