diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:29:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:29:40 -0400 |
| commit | 5a54bd1307471c1cd0521402fe65e2057edcab2f (patch) | |
| tree | 25fb6a543db4ccc11b6d5662ed2e7facfce39ae7 /drivers/uwb/drp.c | |
| parent | f9f35677d81adb0feedcd6e0e661784805c8facd (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge commit 'v2.6.29' into core/header-fixes
Diffstat (limited to 'drivers/uwb/drp.c')
| -rw-r--r-- | drivers/uwb/drp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c index 2b4f9406789d..4f5ca99a04b9 100644 --- a/drivers/uwb/drp.c +++ b/drivers/uwb/drp.c | |||
| @@ -66,14 +66,14 @@ static void uwb_rc_set_drp_cmd_done(struct uwb_rc *rc, void *arg, | |||
| 66 | } else | 66 | } else |
| 67 | dev_err(&rc->uwb_dev.dev, "SET-DRP-IE: timeout\n"); | 67 | dev_err(&rc->uwb_dev.dev, "SET-DRP-IE: timeout\n"); |
| 68 | 68 | ||
| 69 | spin_lock(&rc->rsvs_lock); | 69 | spin_lock_bh(&rc->rsvs_lock); |
| 70 | if (rc->set_drp_ie_pending > 1) { | 70 | if (rc->set_drp_ie_pending > 1) { |
| 71 | rc->set_drp_ie_pending = 0; | 71 | rc->set_drp_ie_pending = 0; |
| 72 | uwb_rsv_queue_update(rc); | 72 | uwb_rsv_queue_update(rc); |
| 73 | } else { | 73 | } else { |
| 74 | rc->set_drp_ie_pending = 0; | 74 | rc->set_drp_ie_pending = 0; |
| 75 | } | 75 | } |
| 76 | spin_unlock(&rc->rsvs_lock); | 76 | spin_unlock_bh(&rc->rsvs_lock); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | /** | 79 | /** |