Merge tag 'hyperv-next-signed-20210831' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / net / can / raw.c

diff --git a/net/can/raw.c b/net/can/raw.c
index cd5a493..7105fa4 100644 (file)
--- 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();