From 37a9a34f62dffd133bad17e4a2f46a8ae0fc21f3 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 18 Nov 2009 10:31:57 +0200
Subject: [PATCH] --- yaml --- r: 170102 b: refs/heads/master c:
 bec145ae6f6978f0319e5600a742f45f76ecc4dd h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/core/control.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec2f3b3b05b0..51be3d5c30a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67f2db24fbfdb63495d995d6fbbbe42980004ee0
+refs/heads/master: bec145ae6f6978f0319e5600a742f45f76ecc4dd
diff --git a/trunk/sound/core/control.c b/trunk/sound/core/control.c
index a8b7fabe645e..b586019faf3f 100644
--- a/trunk/sound/core/control.c
+++ b/trunk/sound/core/control.c
@@ -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;
 		}