Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[deliverable/linux.git] / drivers / bluetooth / btuart_cs.c

diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index a03ecc22a561caf4c3d1bdc53489a5b9612745d8..fb948f02eda5b1747a7ca7604133daf88a719ef1 100644 (file)
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -149,7 +149,8 @@ static void btuart_write_wakeup(btuart_info_t *info)
                if (!pcmcia_dev_present(info->p_dev))
                        return;
 
-               if (!(skb = skb_dequeue(&(info->txq))))
+               skb = skb_dequeue(&(info->txq));
+               if (!skb)
                        break;
 
                /* Send frame */
@@ -190,7 +191,8 @@ static void btuart_receive(btuart_info_t *info)
                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;
                        }