| Message ID | 1425992075-1707-1-git-send-email-o-takashi@sakamocchi.jp (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 59294a01d7037f63fb8bf994af10ce63c618770a |
| Headers | show |
At Tue, 10 Mar 2015 21:54:35 +0900, Takashi Sakamoto wrote: > > With previous commit, this module managed to leave the counting to each > drivers, but the isochronous resources functionality still increment/decrement > the count. > > This commit purge such codes to leave the responsibility to each drivers. > > Fix: c6f224dc20ad ('ALSA: firewire-lib: remove reference counting') > Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Applied, thanks. Takashi > --- > sound/firewire/iso-resources.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/firewire/iso-resources.c b/sound/firewire/iso-resources.c > index 5f17b77..f0e4d50 100644 > --- a/sound/firewire/iso-resources.c > +++ b/sound/firewire/iso-resources.c > @@ -26,7 +26,7 @@ > int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit) > { > r->channels_mask = ~0uLL; > - r->unit = fw_unit_get(unit); > + r->unit = unit; > mutex_init(&r->mutex); > r->allocated = false; > > @@ -42,7 +42,6 @@ void fw_iso_resources_destroy(struct fw_iso_resources *r) > { > WARN_ON(r->allocated); > mutex_destroy(&r->mutex); > - fw_unit_put(r->unit); > } > EXPORT_SYMBOL(fw_iso_resources_destroy); > > -- > 2.1.0 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >
diff --git a/sound/firewire/iso-resources.c b/sound/firewire/iso-resources.c index 5f17b77..f0e4d50 100644 --- a/sound/firewire/iso-resources.c +++ b/sound/firewire/iso-resources.c @@ -26,7 +26,7 @@ int fw_iso_resources_init(struct fw_iso_resources *r, struct fw_unit *unit) { r->channels_mask = ~0uLL; - r->unit = fw_unit_get(unit); + r->unit = unit; mutex_init(&r->mutex); r->allocated = false; @@ -42,7 +42,6 @@ void fw_iso_resources_destroy(struct fw_iso_resources *r) { WARN_ON(r->allocated); mutex_destroy(&r->mutex); - fw_unit_put(r->unit); } EXPORT_SYMBOL(fw_iso_resources_destroy);
With previous commit, this module managed to leave the counting to each drivers, but the isochronous resources functionality still increment/decrement the count. This commit purge such codes to leave the responsibility to each drivers. Fix: c6f224dc20ad ('ALSA: firewire-lib: remove reference counting') Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> --- sound/firewire/iso-resources.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)