Merge branch 'topic/vmaster-update' into topic/docbook-fix

[linux-2.6-omap-h63xx.git] / drivers / uwb / rsv.c

diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c
index 886f977cd2eaf386ee6706af6c8e53be7a921e85..6b76f4bb4cc7dc5a25da658c0cc2d006ba3662f0 100644 (file)
--- a/drivers/uwb/rsv.c
+++ b/drivers/uwb/rsv.c
@@ -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);
 }
 
 /*