| Message ID | 1415365954-15019-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 31584ed18c073176a7ad96ddbfd09765e21e813d |
| Headers | show |
At Fri, 7 Nov 2014 14:12:34 +0100, Lars-Peter Clausen wrote: > > We want to know the offset for the id that was passed to the function, not > the offset of the first id of the control (which is always 0). > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > The function seems currently unused, so no need to add this for stable Thanks, applied. (As I'd like to reduce the amounts post rc4, I put this to for-next branch, so it'll be merged in 3.19.) Takashi > --- > sound/core/control.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/core/control.c b/sound/core/control.c > index 99aa3aa..bb96a46 100644 > --- a/sound/core/control.c > +++ b/sound/core/control.c > @@ -572,7 +572,7 @@ int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id, > ret = -ENOENT; > goto unlock; > } > - index_offset = snd_ctl_get_ioff(kctl, &kctl->id); > + index_offset = snd_ctl_get_ioff(kctl, id); > vd = &kctl->vd[index_offset]; > ret = 0; > if (active) { > -- > 1.8.0 >
diff --git a/sound/core/control.c b/sound/core/control.c index 99aa3aa..bb96a46 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -572,7 +572,7 @@ int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id, ret = -ENOENT; goto unlock; } - index_offset = snd_ctl_get_ioff(kctl, &kctl->id); + index_offset = snd_ctl_get_ioff(kctl, id); vd = &kctl->vd[index_offset]; ret = 0; if (active) {
We want to know the offset for the id that was passed to the function, not the offset of the first id of the control (which is always 0). Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- The function seems currently unused, so no need to add this for stable --- sound/core/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)