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/mpu401.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'sound/oss/mpu401.c')
| -rw-r--r-- | sound/oss/mpu401.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index b66f53fa8db0..0aac54c68f01 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c | |||
| @@ -1240,8 +1240,7 @@ void unload_mpu401(struct address_info *hw_config) | |||
| 1240 | p=mpu401_synth_operations[n]; | 1240 | p=mpu401_synth_operations[n]; |
| 1241 | sound_unload_mididev(n); | 1241 | sound_unload_mididev(n); |
| 1242 | sound_unload_timerdev(hw_config->slots[2]); | 1242 | sound_unload_timerdev(hw_config->slots[2]); |
| 1243 | if(p) | 1243 | kfree(p); |
| 1244 | kfree(p); | ||
| 1245 | } | 1244 | } |
| 1246 | } | 1245 | } |
| 1247 | 1246 | ||