Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c1f20b authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Fix two minor style issues in HCI code 



WARNING: min() should probably be min_t(__u16, scb->expect, count)
+		len = min(scb->expect, (__u16)count);

WARNING: Statements terminations use 1 semicolon
+	INIT_LIST_HEAD(&conn->chan_list);;

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent e5f0e151

net/bluetooth/hci_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) 


	skb_queue_head_init(&conn->data_q);



	INIT_LIST_HEAD(&conn->chan_list);;

	INIT_LIST_HEAD(&conn->chan_list);



	INIT_DELAYED_WORK(&conn->disc_work, hci_conn_timeout);

	setup_timer(&conn->idle_timer, hci_conn_idle, (unsigned long)conn);

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1957,7 +1957,7 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data, 


	while (count) {

		scb = (void *) skb->cb;

		len = min(scb->expect, (__u16)count);

		len = min_t(__u16, scb->expect, count);



		memcpy(skb_put(skb, len), data, len);