Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 8 insertions, 8 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index a8b7fabe645e..439ce64f9d82 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -75,7 +75,7 @@ static int snd_ctl_open(struct inode *inode, struct file *file)
         ctl->card = card;
         ctl->prefer_pcm_subdevice = -1;
         ctl->prefer_rawmidi_subdevice = -1;
-        ctl->pid = current->pid;
+        ctl->pid = get_pid(task_pid(current));
         file->private_data = ctl;
         write_lock_irqsave(&card->ctl_files_rwlock, flags);
         list_add_tail(&ctl->list, &card->ctl_files);
@@ -125,6 +125,7 @@ static int snd_ctl_release(struct inode *inode, struct file *file)
                                 control->vd[idx].owner = NULL;
         up_write(&card->controls_rwsem);
         snd_ctl_empty_read_queue(ctl);
+        put_pid(ctl->pid);
         kfree(ctl);
         module_put(card->module);
         snd_card_file_remove(card, file);
@@ -236,8 +237,9 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol,
         access = ncontrol->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :
                  (ncontrol->access & (SNDRV_CTL_ELEM_ACCESS_READWRITE|
                                       SNDRV_CTL_ELEM_ACCESS_INACTIVE|
-                                      SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE|
-                                      SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK));
+                                      SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE|
+                                      SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND|
+                                      SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK));
         kctl.info = ncontrol->info;
         kctl.get = ncontrol->get;
         kctl.put = ncontrol->put;
@@ -672,7 +674,7 @@ static int snd_ctl_elem_info(struct snd_ctl_file *ctl,
                         info->access |= SNDRV_CTL_ELEM_ACCESS_LOCK;
                         if (vd->owner == ctl)
                                 info->access |= SNDRV_CTL_ELEM_ACCESS_OWNER;
-                        info->owner = vd->owner_pid;
+                        info->owner = pid_vnr(vd->owner->pid);
                 } else {
                         info->owner = -1;
                 }
@@ -827,7 +829,6 @@ static int snd_ctl_elem_lock(struct snd_ctl_file *file,
                         result = -EBUSY;
                 else {
                         vd->owner = file;
-                        vd->owner_pid = current->pid;
                         result = 0;
                 }
         }
@@ -858,7 +859,6 @@ static int snd_ctl_elem_unlock(struct snd_ctl_file *file,
                         result = -EPERM;
                 else {
                         vd->owner = NULL;
-                        vd->owner_pid = 0;
                         result = 0;
                 }
         }
@@ -1100,7 +1100,7 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,
 
         if (copy_from_user(&tlv, _tlv, sizeof(tlv)))
                 return -EFAULT;
-        if (tlv.length < sizeof(unsigned int) * 3)
+        if (tlv.length < sizeof(unsigned int) * 2)
                 return -EINVAL;
         down_read(&card->controls_rwsem);
         kctl = snd_ctl_find_numid(card, tlv.numid);
@@ -1120,7 +1120,7 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,
                 goto __kctl_end;
         }
         if (vd->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {
-                if (file && vd->owner != NULL && vd->owner != file) {
+                if (vd->owner != NULL && vd->owner != file) {
                         err = -EPERM;
                         goto __kctl_end;
                 }