1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 57427de864a6..a9a989e5ee88 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -257,7 +257,8 @@ static void bluecard_write_wakeup(bluecard_info_t *info)
                         ready_bit = XMIT_BUF_ONE_READY;
                 }
 
-                if (!(skb = skb_dequeue(&(info->txq))))
+                skb = skb_dequeue(&(info->txq));
+                if (!skb)
                         break;
 
                 if (bt_cb(skb)->pkt_type & 0x80) {
@@ -391,7 +392,8 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset)
                 if (info->rx_skb == NULL) {
                         info->rx_state = RECV_WAIT_PACKET_TYPE;
                         info->rx_count = 0;
-                        if (!(info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
+                        info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);
+                        if (!info->rx_skb) {
                                 BT_ERR("Can't allocate mem for new packet");
                                 return;
                         }
@@ -566,7 +568,8 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud)
         /* Ericsson baud rate command */
         unsigned char cmd[] = { HCI_COMMAND_PKT, 0x09, 0xfc, 0x01, 0x03 };
 
-        if (!(skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {
+        skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);
+        if (!skb) {
                 BT_ERR("Can't allocate mem for new packet");
                 return -1;
         }