1 files changed, 6 insertions, 3 deletions

diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index 8e5f292529a..2cee71a714c 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -115,7 +115,8 @@ static inline void cmtp_add_msgpart(struct cmtp_session *session, int id, const
 
         size = (skb) ? skb->len + count : count;
 
-        if (!(nskb = alloc_skb(size, GFP_ATOMIC))) {
+        nskb = alloc_skb(size, GFP_ATOMIC);
+        if (!nskb) {
                 BT_ERR("Can't allocate memory for CAPI message");
                 return;
         }
@@ -216,7 +217,8 @@ static void cmtp_process_transmit(struct cmtp_session *session)
 
         BT_DBG("session %p", session);
 
-        if (!(nskb = alloc_skb(session->mtu, GFP_ATOMIC))) {
+        nskb = alloc_skb(session->mtu, GFP_ATOMIC);
+        if (!nskb) {
                 BT_ERR("Can't allocate memory for new frame");
                 return;
         }
@@ -224,7 +226,8 @@ static void cmtp_process_transmit(struct cmtp_session *session)
         while ((skb = skb_dequeue(&session->transmit))) {
                 struct cmtp_scb *scb = (void *) skb->cb;
 
-                if ((tail = (session->mtu - nskb->len)) < 5) {
+                tail = session->mtu - nskb->len;
+                if (tail < 5) {
                         cmtp_send_frame(session, nskb->data, nskb->len);
                         skb_trim(nskb, 0);
                         tail = session->mtu;