diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 17:09:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 17:09:02 +0100 |
| commit | 8f0cb147b2fb12427bf6abef7fed2b604557a41e (patch) | |
| tree | fb5ba437ee74b900fab9686c8c7df18abcd7640b /sound/drivers/mpu401/mpu401_uart.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 (diff) | |
| parent | [ALSA] version 1.0.10rc3 (diff) | |
| download | linux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.tar.xz linux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/drivers/mpu401/mpu401_uart.c')
| -rw-r--r-- | sound/drivers/mpu401/mpu401_uart.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c index fe3f921ffbe3..bdeb2c00dac5 100644 --- a/sound/drivers/mpu401/mpu401_uart.c +++ b/sound/drivers/mpu401/mpu401_uart.c @@ -423,10 +423,7 @@ static void snd_mpu401_uart_free(snd_rawmidi_t *rmidi) mpu401_t *mpu = rmidi->private_data; if (mpu->irq_flags && mpu->irq >= 0) free_irq(mpu->irq, (void *) mpu); - if (mpu->res) { - release_resource(mpu->res); - kfree_nocheck(mpu->res); - } + release_and_free_resource(mpu->res); kfree(mpu); } |