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

Commit 8f5140a6 authored by David Vrabel's avatar David Vrabel
Browse files

uwb: lock rc->rsvs_lock with spin_lock_bh() 



rc->rsvs_lock may be taken in a timer so lock it with spin_lock_bh().

Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
parent dff243f7

drivers/uwb/drp.c

+2 −2
Original line number Diff line number Diff line
@@ -66,14 +66,14 @@ static void uwb_rc_set_drp_cmd_done(struct uwb_rc *rc, void *arg, 
	} else

		dev_err(&rc->uwb_dev.dev, "SET-DRP-IE: timeout\n");



	spin_lock(&rc->rsvs_lock);

	spin_lock_bh(&rc->rsvs_lock);

	if (rc->set_drp_ie_pending > 1) {

		rc->set_drp_ie_pending = 0;

		uwb_rsv_queue_update(rc);	

	} else {

		rc->set_drp_ie_pending = 0;	

	}

	spin_unlock(&rc->rsvs_lock);

	spin_unlock_bh(&rc->rsvs_lock);

}



/**

drivers/uwb/rsv.c

+2 −2
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ void uwb_rsv_queue_update(struct uwb_rc *rc) 
 */

void uwb_rsv_sched_update(struct uwb_rc *rc)

{

	spin_lock(&rc->rsvs_lock);

	spin_lock_bh(&rc->rsvs_lock);

	if (!delayed_work_pending(&rc->rsv_update_work)) {

		if (rc->set_drp_ie_pending > 0) {

			rc->set_drp_ie_pending++;
@@ -879,7 +879,7 @@ void uwb_rsv_sched_update(struct uwb_rc *rc) 
		uwb_rsv_queue_update(rc);

	}

unlock:

	spin_unlock(&rc->rsvs_lock);

	spin_unlock_bh(&rc->rsvs_lock);

}



/*