All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: clemens@ladisch.de, tiwai@suse.de
Cc: alsa-devel@alsa-project.org
Subject: [PATCH 2/4] ctl: fix a bug to return no identical information in info operation for userspace controls
Date: Sat, 11 Apr 2015 17:41:03 +0900	[thread overview]
Message-ID: <1428741665-22262-3-git-send-email-o-takashi@sakamocchi.jp> (raw)
In-Reply-To: <1428741665-22262-1-git-send-email-o-takashi@sakamocchi.jp>

In operations of SNDRV_CTL_IOCTL_ELEM_INFO, identical information in
returned value is cleared. This is not better to userspace application.

This commit confirms to return full identical information to the
operations.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 sound/core/control.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/sound/core/control.c b/sound/core/control.c
index 90a9e5d..a750846 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1040,8 +1040,12 @@ static int snd_ctl_elem_user_info(struct snd_kcontrol *kcontrol,
 				  struct snd_ctl_elem_info *uinfo)
 {
 	struct user_element *ue = kcontrol->private_data;
+	unsigned int offset;
 
+	offset = snd_ctl_get_ioff(kcontrol, &uinfo->id);
 	*uinfo = ue->info;
+	snd_ctl_build_ioff(&uinfo->id, kcontrol, offset);
+
 	return 0;
 }
 
@@ -1051,10 +1055,13 @@ static int snd_ctl_elem_user_enum_info(struct snd_kcontrol *kcontrol,
 	struct user_element *ue = kcontrol->private_data;
 	const char *names;
 	unsigned int item;
+	unsigned int offset;
 
 	item = uinfo->value.enumerated.item;
 
+	offset = snd_ctl_get_ioff(kcontrol, &uinfo->id);
 	*uinfo = ue->info;
+	snd_ctl_build_ioff(&uinfo->id, kcontrol, offset);
 
 	item = min(item, uinfo->value.enumerated.items - 1);
 	uinfo->value.enumerated.item = item;
-- 
2.1.0

  parent reply	other threads:[~2015-04-11  8:41 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-08 17:07 [PATCH 0/4] ALSA: ctl: fix userspace control element operations Takashi Sakamoto
2015-04-08 17:07 ` [PATCH 1/4] ALSA: ctl: confirm to return all identical information Takashi Sakamoto
2015-04-09  5:36   ` Takashi Iwai
2015-04-10 12:00     ` Takashi Sakamoto
2015-04-10 12:08       ` Takashi Iwai
2015-04-08 17:07 ` [PATCH 2/4] ALSA: ctl: fix a bug to return no identical information in Takashi Sakamoto
2015-04-08 17:07 ` [PATCH 3/4] ALSA: ctl: fill identical information to return value Takashi Sakamoto
2015-04-08 17:07 ` [PATCH 4/4] ALSA: ctl: fix to handle several elements added by Takashi Sakamoto
2015-04-11  8:41 ` [PATCH 0/4 v2] fix userspace control element operations Takashi Sakamoto
2015-04-11  8:41   ` [PATCH 1/4] ctl: confirm to return all identical information in 'activate' event Takashi Sakamoto
2015-04-11 15:40     ` Takashi Iwai
2015-04-11  8:41   ` Takashi Sakamoto [this message]
2015-04-11 15:40     ` [PATCH 2/4] ctl: fix a bug to return no identical information in info operation for userspace controls Takashi Iwai
2015-04-11  8:41   ` [PATCH 3/4] ctl: fill identical information to return value when adding userspace elements Takashi Sakamoto
2015-04-11 15:41     ` Takashi Iwai
2015-04-11  8:41   ` [PATCH 4/4] ctl: fix to handle several elements added by one operation for userspace element Takashi Sakamoto
2015-04-11 15:42     ` Takashi Iwai
2015-04-12  0:15       ` Takashi Sakamoto
2015-04-11 15:41   ` [PATCH 0/4 v2] fix userspace control element operations Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1428741665-22262-3-git-send-email-o-takashi@sakamocchi.jp \
    --to=o-takashi@sakamocchi.jp \
    --cc=alsa-devel@alsa-project.org \
    --cc=clemens@ladisch.de \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.