diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:37 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:37 -0500 |
| commit | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (patch) | |
| tree | 218c74fde12577ea22f51eabcf4e8b65273edb54 /sound/core | |
| parent | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (diff) | |
| parent | fb716c0b7bed36064cd41d800c8f339f41adf084 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 73dc10ac33f6..268ab7471224 100644 --- a/sound/core/control.c +++ b/sound/core/control.c | |||
| @@ -1119,7 +1119,7 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file, | |||
| 1119 | goto __kctl_end; | 1119 | goto __kctl_end; |
| 1120 | } | 1120 | } |
| 1121 | if (vd->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { | 1121 | if (vd->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { |
| 1122 | if (file && vd->owner != NULL && vd->owner != file) { | 1122 | if (vd->owner != NULL && vd->owner != file) { |
| 1123 | err = -EPERM; | 1123 | err = -EPERM; |
| 1124 | goto __kctl_end; | 1124 | goto __kctl_end; |
| 1125 | } | 1125 | } |