diff options
| author |   David Vrabel <david.vrabel@csr.com> | 2008-10-27 15:10:14 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-28 11:57:02 +0000 |
| commit | 6a4b58707903cb0901966ac8dad5d6ec7f2d432f (patch) | |
| tree | 7fef13054c1cfbb57774b04f99f1d1d8a2b1233f /drivers/uwb | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| download | linux-dev-6a4b58707903cb0901966ac8dad5d6ec7f2d432f.tar.xz linux-dev-6a4b58707903cb0901966ac8dad5d6ec7f2d432f.zip | |
uwb: target reservations shouldn't get streams
The reservation owner should decide the stream index to use based on
what reservations it's created.
Signed-off-by: David Vrabel <david.vrabel@csr.com>
Diffstat (limited to 'drivers/uwb')
| -rw-r--r-- | drivers/uwb/rsv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c index bae16204576d..e4facae46e0d 100644 --- a/drivers/uwb/rsv.c +++ b/drivers/uwb/rsv.c @@ -285,7 +285,8 @@ void uwb_rsv_set_state(struct uwb_rsv *rsv, enum uwb_rsv_state new_state) switch (new_state) { case UWB_RSV_STATE_NONE: uwb_drp_avail_release(rsv->rc, &rsv->mas); - uwb_rsv_put_stream(rsv); + if (uwb_rsv_is_owner(rsv)) + uwb_rsv_put_stream(rsv); uwb_rsv_state_update(rsv, UWB_RSV_STATE_NONE); uwb_rsv_callback(rsv); break; @@ -532,7 +533,6 @@ static struct uwb_rsv *uwb_rsv_new_target(struct uwb_rc *rc, rsv->target.dev = &rc->uwb_dev; rsv->type = uwb_ie_drp_type(drp_ie); rsv->stream = uwb_ie_drp_stream_index(drp_ie); - set_bit(rsv->stream, rsv->owner->streams); uwb_drp_ie_to_bm(&rsv->mas, drp_ie); /* |