Merge branch 'topic/misc' into for-linus

This commit is contained in:
Takashi Iwai
2009-12-04 16:22:37 +01:00
36 changed files with 1467 additions and 706 deletions

View File

@@ -1119,7 +1119,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;
}