diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /drivers/uwb/drp.c | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | /** |