aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire/iso-resources.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/firewire/iso-resources.c')
-rw-r--r--sound/firewire/iso-resources.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/firewire/iso-resources.c b/sound/firewire/iso-resources.c
index 775dbd5f3445..bb9c0c1fb529 100644
--- a/sound/firewire/iso-resources.c
+++ b/sound/firewire/iso-resources.c
@@ -11,7 +11,6 @@
11#include <linux/jiffies.h> 11#include <linux/jiffies.h>
12#include <linux/mutex.h> 12#include <linux/mutex.h>
13#include <linux/sched.h> 13#include <linux/sched.h>
14#include <linux/slab.h>
15#include <linux/spinlock.h> 14#include <linux/spinlock.h>
16#include "iso-resources.h" 15#include "iso-resources.h"
17 16
@@ -25,10 +24,6 @@
25 */ 24 */
26int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit) 25int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit)
27{ 26{
28 r->buffer = kmalloc(2 * 4, GFP_KERNEL);
29 if (!r->buffer)
30 return -ENOMEM;
31
32 r->channels_mask = ~0uLL; 27 r->channels_mask = ~0uLL;
33 r->unit = fw_unit_get(unit); 28 r->unit = fw_unit_get(unit);
34 mutex_init(&r->mutex); 29 mutex_init(&r->mutex);
@@ -44,7 +39,6 @@ int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit)
44void fw_iso_resources_destroy(struct fw_iso_resources *r) 39void fw_iso_resources_destroy(struct fw_iso_resources *r)
45{ 40{
46 WARN_ON(r->allocated); 41 WARN_ON(r->allocated);
47 kfree(r->buffer);
48 mutex_destroy(&r->mutex); 42 mutex_destroy(&r->mutex);
49 fw_unit_put(r->unit); 43 fw_unit_put(r->unit);
50} 44}
@@ -131,7 +125,7 @@ retry_after_bus_reset:
131 125
132 bandwidth = r->bandwidth + r->bandwidth_overhead; 126 bandwidth = r->bandwidth + r->bandwidth_overhead;
133 fw_iso_resource_manage(card, r->generation, r->channels_mask, 127 fw_iso_resource_manage(card, r->generation, r->channels_mask,
134 &channel, &bandwidth, true, r->buffer); 128 &channel, &bandwidth, true);
135 if (channel == -EAGAIN) { 129 if (channel == -EAGAIN) {
136 mutex_unlock(&r->mutex); 130 mutex_unlock(&r->mutex);
137 goto retry_after_bus_reset; 131 goto retry_after_bus_reset;
@@ -184,7 +178,7 @@ int fw_iso_resources_update(struct fw_iso_resources *r)
184 bandwidth = r->bandwidth + r->bandwidth_overhead; 178 bandwidth = r->bandwidth + r->bandwidth_overhead;
185 179
186 fw_iso_resource_manage(card, r->generation, 1uLL << r->channel, 180 fw_iso_resource_manage(card, r->generation, 1uLL << r->channel,
187 &channel, &bandwidth, true, r->buffer); 181 &channel, &bandwidth, true);
188 /* 182 /*
189 * When another bus reset happens, pretend that the allocation 183 * When another bus reset happens, pretend that the allocation
190 * succeeded; we will try again for the new generation later. 184 * succeeded; we will try again for the new generation later.
@@ -220,7 +214,7 @@ void fw_iso_resources_free(struct fw_iso_resources *r)
220 if (r->allocated) { 214 if (r->allocated) {
221 bandwidth = r->bandwidth + r->bandwidth_overhead; 215 bandwidth = r->bandwidth + r->bandwidth_overhead;
222 fw_iso_resource_manage(card, r->generation, 1uLL << r->channel, 216 fw_iso_resource_manage(card, r->generation, 1uLL << r->channel,
223 &channel, &bandwidth, false, r->buffer); 217 &channel, &bandwidth, false);
224 if (channel < 0) 218 if (channel < 0)
225 dev_err(&r->unit->device, 219 dev_err(&r->unit->device,
226 "isochronous resource deallocation failed\n"); 220 "isochronous resource deallocation failed\n");