Skip to content

Commit

Permalink
uwb: lock rc->rsvs_lock with spin_lock_bh()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Vrabel committed Jan 23, 2009
1 parent dff243f commit 8f5140a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/uwb/drp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions drivers/uwb/rsv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand All @@ -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);
}

/*
Expand Down

0 comments on commit 8f5140a

Please sign in to comment.