iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: uwb: use correct locking calls for rc data

Browse Source 
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>
This commit is contained in:
tpugliese 2013-05-20 15:09:05 -05:00 committed by Greg Kroah-Hartman
parent c0c6e07949
commit 3138887bd8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/uwb/drp.c
View File

@ -67,14 +67,14 @@ static void uwb_rc_set_drp_cmd_done(struct uwb_rc *rc, void *arg,
} else } else
dev_err(&rc->uwb_dev.dev, "SET-DRP-IE: timeout\n"); 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) { if (rc->set_drp_ie_pending > 1) {
rc->set_drp_ie_pending = 0; rc->set_drp_ie_pending = 0;
uwb_rsv_queue_update(rc); uwb_rsv_queue_update(rc);
} else { } else {
rc->set_drp_ie_pending = 0; rc->set_drp_ie_pending = 0;
} }
spin_unlock_bh(&rc->rsvs_lock); spin_unlock_irq(&rc->rsvs_lock);
} }
/** /**

4
drivers/uwb/rsv.c
View File

@ -872,7 +872,7 @@ void uwb_rsv_queue_update(struct uwb_rc *rc)
*/ */
void uwb_rsv_sched_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 (!delayed_work_pending(&rc->rsv_update_work)) {
if (rc->set_drp_ie_pending > 0) { if (rc->set_drp_ie_pending > 0) {
rc->set_drp_ie_pending++; rc->set_drp_ie_pending++;
@ -881,7 +881,7 @@ void uwb_rsv_sched_update(struct uwb_rc *rc)
uwb_rsv_queue_update(rc); uwb_rsv_queue_update(rc);
} }
unlock: unlock:
spin_unlock_bh(&rc->rsvs_lock); spin_unlock_irq(&rc->rsvs_lock);
} }
/* /*