1 files changed, 6 insertions, 2 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index 6d71f9a7ccbb..636b3b52ef8b 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -113,7 +113,6 @@ static int snd_ctl_release(struct inode *inode, struct file *file)
         unsigned int idx;
 
         ctl = file->private_data;
-        fasync_helper(-1, file, 0, &ctl->fasync);
         file->private_data = NULL;
         card = ctl->card;
         write_lock_irqsave(&card->ctl_files_rwlock, flags);
@@ -225,8 +224,13 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol,
         kctl.id.iface = ncontrol->iface;
         kctl.id.device = ncontrol->device;
         kctl.id.subdevice = ncontrol->subdevice;
-        if (ncontrol->name)
+        if (ncontrol->name) {
                 strlcpy(kctl.id.name, ncontrol->name, sizeof(kctl.id.name));
+                if (strcmp(ncontrol->name, kctl.id.name) != 0)
+                        snd_printk(KERN_WARNING
+                                   "Control name '%s' truncated to '%s'\n",
+                                   ncontrol->name, kctl.id.name);
+        }
         kctl.id.index = ncontrol->index;
         kctl.count = ncontrol->count ? ncontrol->count : 1;
         access = ncontrol->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :