Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6a4b58...
Commit:     6a4b58707903cb0901966ac8dad5d6ec7f2d432f
Parent:     f8d56f1771e4867acc461146764b4feeb5245669
Author:     David Vrabel <david.vrabel@csr.com>
AuthorDate: Mon Oct 27 15:10:14 2008 +0000
Committer:  David Vrabel <david.vrabel@csr.com>
CommitDate: Tue Oct 28 11:57:02 2008 +0000

    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>
---
 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 bae1620..e4facae 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);
 
 	/*
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html