dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: David Vrabel <david.vrabel@csr.com>
This commit is contained in:
David Vrabel 2009-01-23 12:57:20 +00:00
parent dff243f7cb
commit 8f5140a6a0
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

@ -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);
}
/**

4
drivers/uwb/rsv.c
View File

@ -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);
}
/*