diff options
| author |   Valentin Ilie <valentin.ilie@gmail.com> | 2013-08-12 18:46:00 +0300 |
|---|---|---|
| committer |   Johan Hedberg <johan.hedberg@intel.com> | 2014-03-05 20:52:17 +0200 |
| commit | a08b15e66e8ec700992641cf8ec015032e8365c8 (patch) | |
| tree | 01554c5c6963be9da6ba573af135ec7a65f8a9d7 /drivers/bluetooth/dtl1_cs.c | |
| parent | Bluetooth: Fix removing Long Term Key (diff) | |
| download | linux-dev-a08b15e66e8ec700992641cf8ec015032e8365c8.tar.xz linux-dev-a08b15e66e8ec700992641cf8ec015032e8365c8.zip | |
Bluetooth: Remove assignments in if-statements
Remove assignment in if-statements to be consistent with the coding
style.
Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/dtl1_cs.c')
| -rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 52eed1f3565d..2bd8fad17206 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c @@ -153,7 +153,8 @@ static void dtl1_write_wakeup(dtl1_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 */ @@ -215,13 +216,15 @@ static void dtl1_receive(dtl1_info_t *info) info->hdev->stat.byte_rx++; /* Allocate packet */ - if (info->rx_skb == NULL) - if (!(info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) { + if (info->rx_skb == NULL) { + 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"); info->rx_state = RECV_WAIT_NSH; info->rx_count = NSHL; return; } + } *skb_put(info->rx_skb, 1) = inb(iobase + UART_RX); nsh = (nsh_t *)info->rx_skb->data; |