X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=net%2Fcan%2Fraw.c;h=7105fa4824e4b4f48b30186828126c59fd5f2938;hb=c07f191907e7d7e04034a2b9657a6bbf1355c60a;hp=cd5a4938011620cd97aecc2a677615e6a07679ab;hpb=3db903a8ead3e4466f6292e0809adac0cf3fe527;p=linux-2.6-microblaze.git

diff --git a/net/can/raw.c b/net/can/raw.c
index cd5a49380116..7105fa4824e4 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -592,9 +592,7 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
 		ro->count  = count;
 
  out_fil:
-		if (dev)
-			dev_put(dev);
-
+		dev_put(dev);
 		release_sock(sk);
 		rtnl_unlock();
 
@@ -638,9 +636,7 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
 		ro->err_mask = err_mask;
 
  out_err:
-		if (dev)
-			dev_put(dev);
-
+		dev_put(dev);
 		release_sock(sk);
 		rtnl_unlock();