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

Commit a6a67efd authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Marcel Holtmann
Browse files

Bluetooth: Convert hdev->req_lock to a mutex 



hdev->req_lock is used as mutex so make it a mutex.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 5959809d

include/net/bluetooth/hci_core.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ struct hci_dev { 
	struct sk_buff		*sent_cmd;

	struct sk_buff		*sent_cmd;

	struct sk_buff		*reassembly[3];

	struct sk_buff		*reassembly[3];





	struct semaphore	req_lock;

	struct mutex		req_lock;

	wait_queue_head_t	req_wait_q;

	wait_queue_head_t	req_wait_q;

	__u32			req_status;

	__u32			req_status;

	__u32			req_result;

	__u32			req_result;
@@ -704,8 +704,8 @@ struct hci_sec_filter { 
#define HCI_REQ_PEND	  1

#define HCI_REQ_PEND	  1

#define HCI_REQ_CANCELED  2

#define HCI_REQ_CANCELED  2





#define hci_req_lock(d)		down(&d->req_lock)

#define hci_req_lock(d)		mutex_lock(&d->req_lock)

#define hci_req_unlock(d)	up(&d->req_lock)

#define hci_req_unlock(d)	mutex_unlock(&d->req_lock)





void hci_req_complete(struct hci_dev *hdev, int result);

void hci_req_complete(struct hci_dev *hdev, int result);

net/bluetooth/hci_core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -911,7 +911,7 @@ int hci_register_dev(struct hci_dev *hdev) 
		hdev->reassembly[i] = NULL;

		hdev->reassembly[i] = NULL;





	init_waitqueue_head(&hdev->req_wait_q);

	init_waitqueue_head(&hdev->req_wait_q);

	init_MUTEX(&hdev->req_lock);

	mutex_init(&hdev->req_lock);





	inquiry_cache_init(hdev);

	inquiry_cache_init(hdev);