diff --git a/[refs] b/[refs] index 7977565cc47a..2d1c3dfe3a07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 244055fdc8dd39407a33d4eb9f4053dd4ca8f1bb +refs/heads/master: 1bc1731133140dccdd08899a59bbc06d975d0a15 diff --git a/trunk/net/irda/irlan/irlan_client.c b/trunk/net/irda/irlan/irlan_client.c index f8e6cb0db04b..95cf1234ea17 100644 --- a/trunk/net/irda/irlan/irlan_client.c +++ b/trunk/net/irda/irlan/irlan_client.c @@ -173,13 +173,14 @@ void irlan_client_discovery_indication(discinfo_t *discovery, rcu_read_lock(); self = irlan_get_any(); if (self) { - IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); + IRDA_ASSERT(self->magic == IRLAN_MAGIC, goto out;); IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __FUNCTION__ , daddr); irlan_client_wakeup(self, saddr, daddr); } +IRDA_ASSERT_LABEL(out:) rcu_read_unlock(); }