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

Commit 3138887b authored May 20, 2013 by tpugliese Committed by Greg Kroah-Hartman May 21, 2013

usb: uwb: use correct locking calls for rc data



The rc object's members can be accessed from both a timer and URB
callback.  Use spin_*_irq instead of spin_*_bh.

Signed-off-by: Thomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c0c6e079

drivers/uwb/drp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -67,14 +67,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_bh(&rc->rsvs_lock);
		spin_lock_irq(&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_bh(&rc->rsvs_lock);
		spin_unlock_irq(&rc->rsvs_lock);
		}

		/**

drivers/uwb/rsv.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -872,7 +872,7 @@ void uwb_rsv_queue_update(struct uwb_rc *rc)
		*/
		void uwb_rsv_sched_update(struct uwb_rc *rc)
		{
		spin_lock_bh(&rc->rsvs_lock);
		spin_lock_irq(&rc->rsvs_lock);
		if (!delayed_work_pending(&rc->rsv_update_work)) {
		if (rc->set_drp_ie_pending > 0) {
		rc->set_drp_ie_pending++;
		@@ -881,7 +881,7 @@ void uwb_rsv_sched_update(struct uwb_rc *rc)
		uwb_rsv_queue_update(rc);
		}
		unlock:
		spin_unlock_bh(&rc->rsvs_lock);
		spin_unlock_irq(&rc->rsvs_lock);
		}

		/*