From 3457c05860570457860bf21cdb693dc58ec7cf19 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 24 Sep 2012 15:52:33 -0400
Subject: [PATCH] --- yaml --- r: 328091 b: refs/heads/master c:
 2a6c8c7998f95b140f3d3c7ac5dce2fbd6d403e3 h: refs/heads/master i:   328089:
 c7fb3f7479111ba8c18f3fd8ad5cf959a6dac591   328087:
 e2367b97ccbf4ae4932f880c902b2a8b49f8a45b v: v3

---
 [refs]                  | 2 +-
 trunk/include/net/scm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e951bd3896e1..1ffd418ff0dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5889335c506bc50b03266251ac3c8711b674ba7a
+refs/heads/master: 2a6c8c7998f95b140f3d3c7ac5dce2fbd6d403e3
diff --git a/trunk/include/net/scm.h b/trunk/include/net/scm.h
index 456695f5cbc4..975cca01048b 100644
--- a/trunk/include/net/scm.h
+++ b/trunk/include/net/scm.h
@@ -73,7 +73,7 @@ static __inline__ void scm_destroy_cred(struct scm_cookie *scm)
 static __inline__ void scm_destroy(struct scm_cookie *scm)
 {
 	scm_destroy_cred(scm);
-	if (scm && scm->fp)
+	if (scm->fp)
 		__scm_destroy(scm);
 }