Merge commit 'v3.17' into next

2 files changed, 1 insertions, 3 deletions

diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index e8437094d15f..43f750e88e19 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -908,8 +908,7 @@ static int caif_release(struct socket *sock)
         sock->sk = NULL;
 
         WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
-        if (cf_sk->debugfs_socket_dir != NULL)
-                debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
+        debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
 
         lock_sock(&(cf_sk->sk));
         sk->sk_state = CAIF_DISCONNECTED;
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index 0f455227da83..f5afda1abc76 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -547,7 +547,6 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt)
         default:
                 pr_err("Unrecognized Control Frame\n");
                 goto error;
-                break;
         }
         ret = 0;
 error: