Skip to content

Commit

Permalink
NFC: Fix empty HCI message list check
Browse files Browse the repository at this point in the history
list_first_entry() will never return NULL. Instead use
list_for_each_entry_safe() to iterate through the list.

Signed-off-by: Mathias Jeppsson <mathias.jeppsson@sonymobile.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Mathias Jeppsson authored and John W. Linville committed Jul 10, 2012
1 parent b48d966 commit 1913e57
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions net/nfc/hci/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -682,13 +682,12 @@ EXPORT_SYMBOL(nfc_hci_register_device);

void nfc_hci_unregister_device(struct nfc_hci_dev *hdev)
{
struct hci_msg *msg;
struct hci_msg *msg, *n;

skb_queue_purge(&hdev->rx_hcp_frags);
skb_queue_purge(&hdev->msg_rx_queue);

while ((msg = list_first_entry(&hdev->msg_tx_queue, struct hci_msg,
msg_l)) != NULL) {
list_for_each_entry_safe(msg, n, &hdev->msg_tx_queue, msg_l) {
list_del(&msg->msg_l);
skb_queue_purge(&msg->msg_frags);
kfree(msg);
Expand Down

0 comments on commit 1913e57

Please sign in to comment.