summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authortpugliese <thomas.pugliese@gmail.com>2013-05-20 15:09:05 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-21 11:48:03 -0700
commit3138887bd8d18173f3c2baf1e43621c49090cd27 (patch)
treed4290319d1cabec3813854fb7ba67f772161a1a6 /drivers
parentc0c6e079497f850759e64f28f39a5a2d350dc230 (diff)
downloadlinux-3138887bd8d18173f3c2baf1e43621c49090cd27.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/uwb/drp.c4
-rw-r--r--drivers/uwb/rsv.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c
index 3fbcf789dfaa..16ada8341c46 100644
--- a/drivers/uwb/drp.c
+++ b/drivers/uwb/drp.c
@@ -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);
}
/**
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c
index f4ae05f78c42..738e8a8cb811 100644
--- a/drivers/uwb/rsv.c
+++ b/drivers/uwb/rsv.c
@@ -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);
}
/*