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 <[email protected]> diff -uprN -X dontdiff.txt -X linux-3.9.2-vanilla/Documentation/dontdiff linux-3.9.2-vanilla/drivers/uwb/drp.c linux-3.9.2_dev/drivers/uwb/drp.c --- linux-3.9.2-vanilla/drivers/uwb/drp.c 2013-05-11 09:19:28.000000000 -0500 +++ linux-3.9.2_dev/drivers/uwb/drp.c 2013-05-17 15:48:19.516701777 -0500 @@ -67,14 +67,14 @@ static void uwb_rc_set_drp_cmd_done(stru } 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 -uprN -X dontdiff.txt -X linux-3.9.2-vanilla/Documentation/dontdiff linux-3.9.2-vanilla/drivers/uwb/rsv.c linux-3.9.2_dev/drivers/uwb/rsv.c --- linux-3.9.2-vanilla/drivers/uwb/rsv.c 2013-05-11 09:19:28.000000000 -0500 +++ linux-3.9.2_dev/drivers/uwb/rsv.c 2013-05-17 15:48:07.148702205 -0500 @@ -872,7 +872,7 @@ void uwb_rsv_queue_update(struct uwb_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 uwb_rsv_queue_update(rc); } unlock: - spin_unlock_bh(&rc->rsvs_lock); + spin_unlock_irq(&rc->rsvs_lock); } /* -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
