Merge branch 'for-linus' into for-next

[linux-2.6-block.git] / sound / firewire / motu / motu-stream.c

diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
index 8aab5db71c0f91b76d6dabef4575bc2f91abce62..6744d62623158490fb8fa346ca9034d4458f745b 100644 (file)
--- a/sound/firewire/motu/motu-stream.c
+++ b/sound/firewire/motu/motu-stream.c
@@ -343,7 +343,7 @@ static void destroy_stream(struct snd_motu *motu,
        }
 
        amdtp_stream_destroy(stream);
-       fw_iso_resources_free(resources);
+       fw_iso_resources_destroy(resources);
 }
 
 int snd_motu_stream_init_duplex(struct snd_motu *motu)