On Thu, Mar 19, 2015 at 08:30:13PM -0400, Sasha Levin wrote: > From: Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx> > > commit c6f224dc20ad959175c2dfec70b5a61c6503a793 upstream. > This commit was initially tagged for stable 3.19+ so I'm not sure it's appropriate for 3.18. Cheers, -- Luís > AMDTP helper functions increment/decrement reference counter for an > instance of FireWire unit, while it's complicated for each driver to > process error state. > > In previous commit, each driver has the role of reference counting. This > commit removes this role from the helper function. > > Signed-off-by: Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx> > Signed-off-by: Takashi Iwai <tiwai@xxxxxxx> > Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx> > --- > sound/firewire/amdtp.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c > index 95fc2eaf..172074e 100644 > --- a/sound/firewire/amdtp.c > +++ b/sound/firewire/amdtp.c > @@ -66,7 +66,7 @@ static void pcm_period_tasklet(unsigned long data); > int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit, > enum amdtp_stream_direction dir, enum cip_flags flags) > { > - s->unit = fw_unit_get(unit); > + s->unit = unit; > s->direction = dir; > s->flags = flags; > s->context = ERR_PTR(-1); > @@ -92,7 +92,6 @@ void amdtp_stream_destroy(struct amdtp_stream *s) > { > WARN_ON(amdtp_stream_running(s)); > mutex_destroy(&s->mutex); > - fw_unit_put(s->unit); > } > EXPORT_SYMBOL(amdtp_stream_destroy); > > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html